@pietrolubini/homebridge-ecoflow 1.3.0 → 1.4.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 (188) hide show
  1. package/README.md +174 -40
  2. package/config.schema.json +14 -2
  3. package/dist/accessories/batteries/delta2/delta2Accessory.d.ts +10 -0
  4. package/dist/accessories/batteries/delta2/delta2Accessory.js +14 -0
  5. package/dist/accessories/batteries/delta2/delta2Accessory.js.map +1 -0
  6. package/dist/accessories/batteries/delta2/delta2AccessoryBase.d.ts +32 -0
  7. package/dist/accessories/batteries/{batteryAccessoryBase.js → delta2/delta2AccessoryBase.js} +71 -32
  8. package/dist/accessories/batteries/delta2/delta2AccessoryBase.js.map +1 -0
  9. package/dist/accessories/batteries/delta2/delta2MaxAccessory.d.ts +10 -0
  10. package/dist/accessories/batteries/delta2/delta2MaxAccessory.js +14 -0
  11. package/dist/accessories/batteries/delta2/delta2MaxAccessory.js.map +1 -0
  12. package/dist/accessories/batteries/delta2/interfaces/delta2Configuration.d.ts +4 -0
  13. package/dist/accessories/batteries/{interfaces/httpApiBatteryContracts.js → delta2/interfaces/delta2Configuration.js} +1 -1
  14. package/dist/accessories/batteries/delta2/interfaces/delta2Configuration.js.map +1 -0
  15. package/dist/accessories/batteries/delta2/interfaces/delta2HttpApiContracts.d.ts +40 -0
  16. package/dist/accessories/batteries/delta2/interfaces/delta2HttpApiContracts.js +4 -0
  17. package/dist/accessories/batteries/delta2/interfaces/delta2HttpApiContracts.js.map +1 -0
  18. package/dist/accessories/batteries/delta2/interfaces/delta2MqttApiContracts.d.ts +45 -0
  19. package/dist/accessories/batteries/delta2/interfaces/delta2MqttApiContracts.js +25 -0
  20. package/dist/accessories/batteries/delta2/interfaces/delta2MqttApiContracts.js.map +1 -0
  21. package/dist/accessories/batteries/delta2/services/delta2OutletServiceBase.d.ts +5 -0
  22. package/dist/accessories/batteries/{services/outletBatteryServiceBase.js → delta2/services/delta2OutletServiceBase.js} +4 -4
  23. package/dist/accessories/batteries/delta2/services/delta2OutletServiceBase.js.map +1 -0
  24. package/dist/accessories/batteries/delta2/services/outletAcService.d.ts +10 -0
  25. package/dist/accessories/batteries/delta2/services/outletAcService.js +23 -0
  26. package/dist/accessories/batteries/delta2/services/outletAcService.js.map +1 -0
  27. package/dist/accessories/batteries/delta2/services/outletCarService.d.ts +7 -0
  28. package/dist/accessories/batteries/delta2/services/outletCarService.js +16 -0
  29. package/dist/accessories/batteries/delta2/services/outletCarService.js.map +1 -0
  30. package/dist/accessories/batteries/delta2/services/outletCarService.spec.d.ts +1 -0
  31. package/dist/accessories/batteries/delta2/services/outletUsbService.d.ts +7 -0
  32. package/dist/accessories/batteries/delta2/services/outletUsbService.js +16 -0
  33. package/dist/accessories/batteries/delta2/services/outletUsbService.js.map +1 -0
  34. package/dist/accessories/batteries/delta2/services/outletUsbService.spec.d.ts +1 -0
  35. package/dist/accessories/batteries/delta2/services/switchXboostService.d.ts +10 -0
  36. package/dist/accessories/batteries/delta2/services/switchXboostService.js +33 -0
  37. package/dist/accessories/batteries/delta2/services/switchXboostService.js.map +1 -0
  38. package/dist/accessories/batteries/delta2/services/switchXboostService.spec.d.ts +1 -0
  39. package/dist/accessories/batteries/delta2/simulations/delta2Simulator.d.ts +6 -0
  40. package/dist/accessories/batteries/delta2/simulations/delta2Simulator.js +73 -0
  41. package/dist/accessories/batteries/delta2/simulations/delta2Simulator.js.map +1 -0
  42. package/dist/accessories/batteries/deltapro/deltaProAccessory.d.ts +3 -0
  43. package/dist/accessories/batteries/deltapro/deltaProAccessory.js +8 -0
  44. package/dist/accessories/batteries/deltapro/deltaProAccessory.js.map +1 -0
  45. package/dist/accessories/batteries/{batteryAccessoryBase.d.ts → deltapro/deltaProAccessoryBase.d.ts} +8 -9
  46. package/dist/accessories/batteries/deltapro/deltaProAccessoryBase.js +119 -0
  47. package/dist/accessories/batteries/deltapro/deltaProAccessoryBase.js.map +1 -0
  48. package/dist/accessories/batteries/deltapro/deltaProAccessoryBase.spec.d.ts +1 -0
  49. package/dist/accessories/batteries/{interfaces/httpApiBatteryContracts.d.ts → deltapro/interfaces/deltaProHttpApiContracts.d.ts} +10 -8
  50. package/dist/accessories/batteries/deltapro/interfaces/deltaProHttpApiContracts.js +3 -0
  51. package/dist/accessories/batteries/deltapro/interfaces/deltaProHttpApiContracts.js.map +1 -0
  52. package/dist/accessories/batteries/deltapro/interfaces/deltaProMqttApiContracts.d.ts +30 -0
  53. package/dist/accessories/batteries/deltapro/interfaces/deltaProMqttApiContracts.js +3 -0
  54. package/dist/accessories/batteries/deltapro/interfaces/deltaProMqttApiContracts.js.map +1 -0
  55. package/dist/accessories/batteries/deltapro/services/deltaProOutletServiceBase.d.ts +5 -0
  56. package/dist/accessories/batteries/deltapro/services/deltaProOutletServiceBase.js +17 -0
  57. package/dist/accessories/batteries/deltapro/services/deltaProOutletServiceBase.js.map +1 -0
  58. package/dist/accessories/batteries/deltapro/services/outletAcService.d.ts +8 -0
  59. package/dist/accessories/batteries/deltapro/services/outletAcService.js +20 -0
  60. package/dist/accessories/batteries/deltapro/services/outletAcService.js.map +1 -0
  61. package/dist/accessories/batteries/deltapro/services/outletAcService.spec.d.ts +1 -0
  62. package/dist/accessories/batteries/deltapro/services/outletCarService.d.ts +7 -0
  63. package/dist/accessories/batteries/deltapro/services/outletCarService.js +19 -0
  64. package/dist/accessories/batteries/deltapro/services/outletCarService.js.map +1 -0
  65. package/dist/accessories/batteries/deltapro/services/outletCarService.spec.d.ts +1 -0
  66. package/dist/accessories/batteries/deltapro/services/outletUsbService.d.ts +7 -0
  67. package/dist/accessories/batteries/deltapro/services/outletUsbService.js +14 -0
  68. package/dist/accessories/batteries/deltapro/services/outletUsbService.js.map +1 -0
  69. package/dist/accessories/batteries/deltapro/services/outletUsbService.spec.d.ts +1 -0
  70. package/dist/accessories/batteries/deltapro/services/switchXboostService.d.ts +9 -0
  71. package/dist/accessories/batteries/deltapro/services/switchXboostService.js +31 -0
  72. package/dist/accessories/batteries/deltapro/services/switchXboostService.js.map +1 -0
  73. package/dist/accessories/batteries/deltapro/services/switchXboostService.spec.d.ts +1 -0
  74. package/dist/accessories/batteries/deltapro/simulations/deltaProSimulator.d.ts +6 -0
  75. package/dist/accessories/batteries/deltapro/simulations/deltaProSimulator.js +48 -0
  76. package/dist/accessories/batteries/deltapro/simulations/deltaProSimulator.js.map +1 -0
  77. package/dist/accessories/batteries/deltaproultra/deltaProUltraAccessory.d.ts +28 -0
  78. package/dist/accessories/batteries/deltaproultra/deltaProUltraAccessory.js +123 -0
  79. package/dist/accessories/batteries/deltaproultra/deltaProUltraAccessory.js.map +1 -0
  80. package/dist/accessories/batteries/deltaproultra/deltaProUltraAccessory.spec.d.ts +1 -0
  81. package/dist/accessories/batteries/deltaproultra/interfaces/deltaProUltraHttpApiContracts.d.ts +48 -0
  82. package/dist/accessories/batteries/deltaproultra/interfaces/deltaProUltraHttpApiContracts.js +10 -0
  83. package/dist/accessories/batteries/deltaproultra/interfaces/deltaProUltraHttpApiContracts.js.map +1 -0
  84. package/dist/accessories/batteries/deltaproultra/interfaces/deltaProUltraMqttApiContracts.d.ts +33 -0
  85. package/dist/accessories/batteries/deltaproultra/interfaces/deltaProUltraMqttApiContracts.js +15 -0
  86. package/dist/accessories/batteries/deltaproultra/interfaces/deltaProUltraMqttApiContracts.js.map +1 -0
  87. package/dist/accessories/batteries/deltaproultra/services/deltaProUltraOutletServiceBase.d.ts +5 -0
  88. package/dist/accessories/batteries/deltaproultra/services/deltaProUltraOutletServiceBase.js +17 -0
  89. package/dist/accessories/batteries/deltaproultra/services/deltaProUltraOutletServiceBase.js.map +1 -0
  90. package/dist/accessories/batteries/deltaproultra/services/outletAcService.d.ts +8 -0
  91. package/dist/accessories/batteries/deltaproultra/services/outletAcService.js +14 -0
  92. package/dist/accessories/batteries/deltaproultra/services/outletAcService.js.map +1 -0
  93. package/dist/accessories/batteries/deltaproultra/services/outletAcService.spec.d.ts +1 -0
  94. package/dist/accessories/batteries/deltaproultra/services/outletUsbService.d.ts +8 -0
  95. package/dist/accessories/batteries/deltaproultra/services/outletUsbService.js +18 -0
  96. package/dist/accessories/batteries/deltaproultra/services/outletUsbService.js.map +1 -0
  97. package/dist/accessories/batteries/deltaproultra/services/outletUsbService.spec.d.ts +1 -0
  98. package/dist/accessories/batteries/deltaproultra/services/switchXboostService.d.ts +9 -0
  99. package/dist/accessories/batteries/deltaproultra/services/switchXboostService.js +31 -0
  100. package/dist/accessories/batteries/deltaproultra/services/switchXboostService.js.map +1 -0
  101. package/dist/accessories/batteries/deltaproultra/services/switchXboostService.spec.d.ts +1 -0
  102. package/dist/accessories/batteries/deltaproultra/simulations/deltaProUltraSimulator.d.ts +6 -0
  103. package/dist/accessories/batteries/deltaproultra/simulations/deltaProUltraSimulator.js +50 -0
  104. package/dist/accessories/batteries/deltaproultra/simulations/deltaProUltraSimulator.js.map +1 -0
  105. package/dist/accessories/batteries/interfaces/batteryHttpApiContracts.d.ts +20 -0
  106. package/dist/accessories/batteries/interfaces/batteryHttpApiContracts.js +28 -0
  107. package/dist/accessories/batteries/interfaces/batteryHttpApiContracts.js.map +1 -0
  108. package/dist/accessories/ecoFlowAccessoryBase.js +3 -1
  109. package/dist/accessories/ecoFlowAccessoryBase.js.map +1 -1
  110. package/dist/accessories/powerstream/interfaces/powerStreamHttpApiContracts.d.ts +21 -0
  111. package/dist/accessories/powerstream/interfaces/powerStreamHttpApiContracts.js +9 -0
  112. package/dist/accessories/powerstream/interfaces/powerStreamHttpApiContracts.js.map +1 -0
  113. package/dist/accessories/powerstream/interfaces/powerStreamMqttApiContracts.d.ts +44 -0
  114. package/dist/accessories/powerstream/interfaces/powerStreamMqttApiContracts.js +21 -0
  115. package/dist/accessories/powerstream/interfaces/powerStreamMqttApiContracts.js.map +1 -0
  116. package/dist/accessories/powerstream/powerStreamAccessory.d.ts +3 -2
  117. package/dist/accessories/powerstream/powerStreamAccessory.js +15 -12
  118. package/dist/accessories/powerstream/powerStreamAccessory.js.map +1 -1
  119. package/dist/accessories/powerstream/services/outletInvService.d.ts +2 -1
  120. package/dist/accessories/powerstream/services/outletInvService.js +2 -2
  121. package/dist/accessories/powerstream/services/outletInvService.js.map +1 -1
  122. package/dist/accessories/powerstream/services/outletService.d.ts +3 -2
  123. package/dist/accessories/powerstream/services/outletService.js +2 -2
  124. package/dist/accessories/powerstream/services/outletService.js.map +1 -1
  125. package/dist/accessories/powerstream/services/powerDemandService.js +2 -2
  126. package/dist/accessories/powerstream/simulations/powerStreamSimulator.d.ts +3 -3
  127. package/dist/accessories/powerstream/simulations/powerStreamSimulator.js +5 -4
  128. package/dist/accessories/powerstream/simulations/powerStreamSimulator.js.map +1 -1
  129. package/dist/apis/containers/mqttClientContainer.js +5 -0
  130. package/dist/apis/containers/mqttClientContainer.js.map +1 -1
  131. package/dist/apis/containers/mqttDevice.js +1 -1
  132. package/dist/apis/containers/mqttDevice.js.map +1 -1
  133. package/dist/apis/interfaces/mqttApiContracts.d.ts +15 -4
  134. package/dist/apis/interfaces/mqttApiContracts.js.map +1 -1
  135. package/dist/config.d.ts +3 -1
  136. package/dist/config.js +4 -0
  137. package/dist/config.js.map +1 -1
  138. package/dist/helpers/batteryStatusProvider.d.ts +4 -0
  139. package/dist/helpers/batteryStatusProvider.js +12 -0
  140. package/dist/helpers/batteryStatusProvider.js.map +1 -0
  141. package/dist/helpers/batteryStatusProvider.spec.d.ts +1 -0
  142. package/dist/homebridge-ui/public/index.html +1 -1
  143. package/dist/homebridge-ui/public/index.js +1 -1
  144. package/dist/homebridge-ui/public/renderers/pluginConfigDevicesRenderer.d.ts +2 -0
  145. package/dist/platform.d.ts +1 -0
  146. package/dist/platform.js +20 -9
  147. package/dist/platform.js.map +1 -1
  148. package/dist/services/batteryStatusService.d.ts +5 -3
  149. package/dist/services/batteryStatusService.js +8 -9
  150. package/dist/services/batteryStatusService.js.map +1 -1
  151. package/dist/services/outletServiceBase.d.ts +6 -2
  152. package/dist/services/outletServiceBase.js +19 -8
  153. package/dist/services/outletServiceBase.js.map +1 -1
  154. package/dist/services/switchXboostServiceBase.d.ts +9 -0
  155. package/dist/services/switchXboostServiceBase.js +23 -0
  156. package/dist/services/switchXboostServiceBase.js.map +1 -0
  157. package/dist/services/switchXboostServiceBase.spec.d.ts +1 -0
  158. package/junit.xml +757 -343
  159. package/package.json +1 -1
  160. package/dist/accessories/batteries/batteryAccessoryBase.js.map +0 -1
  161. package/dist/accessories/batteries/delta2Accessory.d.ts +0 -3
  162. package/dist/accessories/batteries/delta2Accessory.js +0 -8
  163. package/dist/accessories/batteries/delta2Accessory.js.map +0 -1
  164. package/dist/accessories/batteries/delta2maxAccessory.d.ts +0 -3
  165. package/dist/accessories/batteries/delta2maxAccessory.js +0 -8
  166. package/dist/accessories/batteries/delta2maxAccessory.js.map +0 -1
  167. package/dist/accessories/batteries/interfaces/httpApiBatteryContracts.js.map +0 -1
  168. package/dist/accessories/batteries/interfaces/mqttApiBatteryContracts.d.ts +0 -36
  169. package/dist/accessories/batteries/interfaces/mqttApiBatteryContracts.js +0 -18
  170. package/dist/accessories/batteries/interfaces/mqttApiBatteryContracts.js.map +0 -1
  171. package/dist/accessories/batteries/services/outletAcService.d.ts +0 -8
  172. package/dist/accessories/batteries/services/outletAcService.js +0 -24
  173. package/dist/accessories/batteries/services/outletAcService.js.map +0 -1
  174. package/dist/accessories/batteries/services/outletBatteryServiceBase.d.ts +0 -5
  175. package/dist/accessories/batteries/services/outletBatteryServiceBase.js.map +0 -1
  176. package/dist/accessories/batteries/services/outletCarService.d.ts +0 -6
  177. package/dist/accessories/batteries/services/outletCarService.js +0 -17
  178. package/dist/accessories/batteries/services/outletCarService.js.map +0 -1
  179. package/dist/accessories/batteries/services/outletUsbService.d.ts +0 -6
  180. package/dist/accessories/batteries/services/outletUsbService.js +0 -15
  181. package/dist/accessories/batteries/services/outletUsbService.js.map +0 -1
  182. package/dist/accessories/batteries/simulations/batterySimulator.d.ts +0 -6
  183. package/dist/accessories/batteries/simulations/batterySimulator.js +0 -60
  184. package/dist/accessories/batteries/simulations/batterySimulator.js.map +0 -1
  185. /package/dist/accessories/batteries/{batteryAccessoryBase.spec.d.ts → delta2/delta2Accessory.spec.d.ts} +0 -0
  186. /package/dist/accessories/batteries/{services/outletAcService.spec.d.ts → delta2/delta2AccessoryBase.spec.d.ts} +0 -0
  187. /package/dist/accessories/batteries/{services/outletCarService.spec.d.ts → delta2/delta2MaxAccessory.spec.d.ts} +0 -0
  188. /package/dist/accessories/batteries/{services/outletUsbService.spec.d.ts → delta2/services/outletAcService.spec.d.ts} +0 -0
package/README.md CHANGED
@@ -29,6 +29,8 @@ The goal is to add HomeKit support to EcoFlow devices and make them fully contro
29
29
 
30
30
  - [Delta 2](#delta-2)
31
31
  - [Delta 2 Max](#delta-2-max)
32
+ - [Delta Pro](#delta-pro)
33
+ - [Delta Pro Ultra](#delta-pro-ultra)
32
34
  - [PowerStream Micro-inverter](#powerstream-micro-inverter)
33
35
 
34
36
  For a full list of devices that could be potentially added check [here](https://developer-eu.ecoflow.com/us/document/introduction)
@@ -112,26 +114,33 @@ Quota is sent every 10 seconds with random values in this mode.
112
114
 
113
115
  #### Services
114
116
 
115
- | EcoFlow Parameter | Service | Characteristic | Standard | Permission |
116
- | ----------------- | ---------- | --------------------- | -------- | ---------- |
117
- | Battery Level | Battery | BatteryLevel | ✅ | Read |
118
- | Input | Battery | ChargingState | ✅ | Read |
119
- | Battery Level | Battery | StatusLowBattery | ✅ | Read |
120
- | AC | Outlet AC | On | ✅ | Read/Write |
121
- | AC Output | Outlet AC | OutletInUse | ✅ | Read |
122
- | Battery Level | Outlet AC | Battery Level, % | 🔲 | Read |
123
- | Input | Outlet AC | Input Consumption, W | 🔲 | Read |
124
- | Output | Outlet AC | Output Consumption, W | 🔲 | Read |
125
- | 12V DC | Outlet CAR | On | | Read/Write |
126
- | 12V DC Output | Outlet CAR | OutletInUse | | Read |
127
- | Battery Level | Outlet CAR | Battery Level, % | 🔲 | Read |
128
- | Input | Outlet CAR | Input Consumption, W | 🔲 | Read |
129
- | Output | Outlet CAR | Output Consumption, W | 🔲 | Read |
130
- | USB | Outlet USB | On | | Read/Write |
131
- | USB Output | Outlet USB | OutletInUse | | Read |
132
- | Battery Level | Outlet USB | Battery Level, % | 🔲 | Read |
133
- | Input | Outlet USB | Input Consumption, W | 🔲 | Read |
134
- | Output | Outlet USB | Output Consumption, W | 🔲 | Read |
117
+ | EcoFlow Parameter | Service | Characteristic | Standard | Permission |
118
+ | ----------------- | ---------- | ------------------------ | -------- | ---------- |
119
+ | Battery Level | Battery | BatteryLevel | ✅ | Read |
120
+ | Charging State | Battery | ChargingState | ✅ | Read |
121
+ | Battery Level | Battery | StatusLowBattery | ✅ | Read |
122
+ | AC | Outlet AC | On | ✅ | Read/Write |
123
+ | AC Output | Outlet AC | OutletInUse | ✅ | Read |
124
+ | Battery Level | Outlet AC | Battery Level, % | 🔲 | Read |
125
+ | Input | Outlet AC | Input Consumption, W | 🔲 | Read |
126
+ | Output | Outlet AC | Output Consumption, W | 🔲 | Read |
127
+ | Charging State | Outlet AC | ChargingState, Yes/No | 🔲 | Read |
128
+ | Battery Level | Outlet AC | StatusLowBattery, Yes/No | 🔲 | Read |
129
+ | 12V DC | Outlet CAR | On | | Read/Write |
130
+ | 12V DC Output | Outlet CAR | OutletInUse | | Read |
131
+ | Battery Level | Outlet CAR | Battery Level, % | 🔲 | Read |
132
+ | Input | Outlet CAR | Input Consumption, W | 🔲 | Read |
133
+ | Output | Outlet CAR | Output Consumption, W | 🔲 | Read |
134
+ | Charging State | Outlet CAR | ChargingState, Yes/No | 🔲 | Read |
135
+ | Battery Level | Outlet CAR | StatusLowBattery, Yes/No | 🔲 | Read |
136
+ | USB | Outlet USB | On | | Read/Write |
137
+ | USB Output | Outlet USB | OutletInUse | ✅ | Read |
138
+ | Battery Level | Outlet USB | Battery Level, % | 🔲 | Read |
139
+ | Input | Outlet USB | Input Consumption, W | 🔲 | Read |
140
+ | Output | Outlet USB | Output Consumption, W | 🔲 | Read |
141
+ | Charging State | Outlet USB | ChargingState, Yes/No | 🔲 | Read |
142
+ | Battery Level | Outlet USB | StatusLowBattery, Yes/No | 🔲 | Read |
143
+ | Switch X-Boost | Switch | On | ✅ | Read/Write |
135
144
 
136
145
  #### Configuration
137
146
 
@@ -140,6 +149,8 @@ The following additional characteristics is available:
140
149
  - Input Consumption, W
141
150
  - Output Consumption, W
142
151
  - Battery Level, %
152
+ - Charging State
153
+ - Status Low Battery
143
154
 
144
155
  ```json
145
156
  {
@@ -152,7 +163,9 @@ The following additional characteristics is available:
152
163
  "additionalCharacteristics": [
153
164
  "Battery Level, %",
154
165
  "Input Consumption, W",
155
- "Output Consumption, W"
166
+ "Output Consumption, W",
167
+ "Charging State",
168
+ "Status Low Battery"
156
169
  ]
157
170
  }
158
171
  }
@@ -168,28 +181,145 @@ The characteristics could be used as conditions in HomeKit Automation that uses
168
181
 
169
182
  Supported services and configuration are the same as for [Delta 2](#delta-2)
170
183
 
184
+ ### Delta Pro
185
+
186
+ > Not Activated (no testing is performed)
187
+
188
+ #### Services
189
+
190
+ | EcoFlow Parameter | Service | Characteristic | Standard | Permission |
191
+ | ----------------- | ---------- | ------------------------ | -------- | ---------- |
192
+ | Battery Level | Battery | BatteryLevel | ✅ | Read |
193
+ | Charging State | Battery | ChargingState | ✅ | Read |
194
+ | Battery Level | Battery | StatusLowBattery | ✅ | Read |
195
+ | AC | Outlet AC | On | ✅ | Read/Write |
196
+ | AC Output | Outlet AC | OutletInUse | ✅ | Read |
197
+ | Battery Level | Outlet AC | Battery Level, % | 🔲 | Read |
198
+ | Input | Outlet AC | Input Consumption, W | 🔲 | Read |
199
+ | Output | Outlet AC | Output Consumption, W | 🔲 | Read |
200
+ | Charging State | Outlet AC | ChargingState, Yes/No | 🔲 | Read |
201
+ | Battery Level | Outlet AC | StatusLowBattery, Yes/No | 🔲 | Read |
202
+ | 12V DC | Outlet CAR | On | ✅ | Read/Write |
203
+ | 12V DC Output | Outlet CAR | OutletInUse | ✅ | Read |
204
+ | Battery Level | Outlet CAR | Battery Level, % | 🔲 | Read |
205
+ | Input | Outlet CAR | Input Consumption, W | 🔲 | Read |
206
+ | Output | Outlet CAR | Output Consumption, W | 🔲 | Read |
207
+ | Charging State | Outlet CAR | ChargingState, Yes/No | 🔲 | Read |
208
+ | Battery Level | Outlet CAR | StatusLowBattery, Yes/No | 🔲 | Read |
209
+ | USB | Outlet USB | On | ✅ | Read |
210
+ | USB Output | Outlet USB | OutletInUse | ✅ | Read |
211
+ | Battery Level | Outlet USB | Battery Level, % | 🔲 | Read |
212
+ | Input | Outlet USB | Input Consumption, W | 🔲 | Read |
213
+ | Output | Outlet USB | Output Consumption, W | 🔲 | Read |
214
+ | Charging State | Outlet USB | ChargingState, Yes/No | 🔲 | Read |
215
+ | Battery Level | Outlet USB | StatusLowBattery, Yes/No | 🔲 | Read |
216
+ | Switch X-Boost | Switch | On | ✅ | Read/Write |
217
+
218
+ #### Configuration
219
+
220
+ The following additional characteristics is available:
221
+
222
+ - Input Consumption, W
223
+ - Output Consumption, W
224
+ - Battery Level, %
225
+
226
+ ```json
227
+ {
228
+ ...
229
+ "devices": [
230
+ {
231
+ ...
232
+ "model": "Delta Pro",
233
+ "battery": {
234
+ "additionalCharacteristics": [
235
+ "Battery Level, %",
236
+ "Input Consumption, W",
237
+ "Output Consumption, W"
238
+ ]
239
+ }
240
+ }
241
+ ],
242
+ }
243
+ ```
244
+
245
+ ### Delta Pro Ultra
246
+
247
+ > Not Activated (no testing is performed)
248
+
249
+ #### Services
250
+
251
+ | EcoFlow Parameter | Service | Characteristic | Standard | Permission |
252
+ | ----------------- | ---------- | ------------------------ | -------- | ---------- |
253
+ | Battery Level | Battery | BatteryLevel | ✅ | Read |
254
+ | Input | Battery | ChargingState | ✅ | Read |
255
+ | Battery Level | Battery | StatusLowBattery | ✅ | Read |
256
+ | AC | Outlet AC | On | ✅ | Read/Write |
257
+ | AC Output | Outlet AC | OutletInUse | ✅ | Read |
258
+ | Battery Level | Outlet AC | Battery Level, % | 🔲 | Read |
259
+ | Input | Outlet AC | Input Consumption, W | 🔲 | Read |
260
+ | Output | Outlet AC | Output Consumption, W | 🔲 | Read |
261
+ | Charging State | Outlet AC | ChargingState, Yes/No | 🔲 | Read |
262
+ | Battery Level | Outlet AC | StatusLowBattery, Yes/No | 🔲 | Read |
263
+ | USB | Outlet USB | On | ✅ | Read |
264
+ | USB Output | Outlet USB | OutletInUse | ✅ | Read |
265
+ | Battery Level | Outlet USB | Battery Level, % | 🔲 | Read |
266
+ | Input | Outlet USB | Input Consumption, W | 🔲 | Read |
267
+ | Output | Outlet USB | Output Consumption, W | 🔲 | Read |
268
+ | Charging State | Outlet USB | ChargingState, Yes/No | 🔲 | Read |
269
+ | Battery Level | Outlet USB | StatusLowBattery, Yes/No | 🔲 | Read |
270
+ | Switch X-Boost | Switch | On | ✅ | Read/Write |
271
+
272
+ #### Configuration
273
+
274
+ The following additional characteristics is available:
275
+
276
+ - Input Consumption, W
277
+ - Output Consumption, W
278
+ - Battery Level, %
279
+
280
+ ```json
281
+ {
282
+ ...
283
+ "devices": [
284
+ {
285
+ ...
286
+ "model": "Delta Pro Ultra",
287
+ "battery": {
288
+ "additionalCharacteristics": [
289
+ "Battery Level, %",
290
+ "Input Consumption, W",
291
+ "Output Consumption, W"
292
+ ]
293
+ }
294
+ }
295
+ ],
296
+ }
297
+ ```
298
+
171
299
  ### PowerStream Micro-inverter
172
300
 
173
301
  #### Services
174
302
 
175
- | EcoFlow Parameter | Service | Characteristic | Standard | Permission |
176
- | ------------------- | ---------- | --------------------- | -------- | ---------------------------------------------------- |
177
- | Inverter | Outlet INV | On | ✅ | Read (Inverter AC Output > 0: ON) |
178
- | Inverter AC Output | Outlet INV | OutletInUse | ✅ | Read |
179
- | Inverter AC Input | Outlet INV | Input Consumption, W | 🔲 | Read |
180
- | Inverter AC Output | Outlet INV | Output Consumption, W | 🔲 | Read |
181
- | Solar | Outlet PV | On | ✅ | Read (Solar Generation > 0: ON) |
182
- | Solar Generation | Outlet PV | OutletInUse | ✅ | Read |
183
- | Solar Generation | Outlet PV | Output Consumption, W | 🔲 | Read |
184
- | Battery | Outlet BAT | On | ✅ | Read (Battery Discharging > 0: ON) |
185
- | Battery Discharging | Outlet BAT | OutletInUse | ✅ | Read |
186
- | Battery Level | Outlet BAT | Battery Level, % | 🔲 | Read |
187
- | Battery Charging | Outlet BAT | Input Consumption, W | 🔲 | Read |
188
- | Battery Discharging | Outlet BAT | Output Consumption, W | 🔲 | Read |
189
- | Lighting brightness | Lightbulb | On | | Read (> 0%: ON; 0%: OFF) / write (ON: 100%; OFF: 0%) |
190
- | Lighting brightness | Lightbulb | Brightness | | Read/write |
191
- | Power demand | Fan | On | ✅ | Read (> 0%: ON; 0%: OFF) / write (ON: 100%; OFF: 0%) |
192
- | Power demand | Fan | RotationSpeed | ✅ | Read/write |
303
+ | EcoFlow Parameter | Service | Characteristic | Standard | Permission |
304
+ | ---------------------- | ---------- | ------------------------ | -------- | ---------------------------------------------------- |
305
+ | Inverter | Outlet INV | On | ✅ | Read (Inverter AC Output > 0: ON) |
306
+ | Inverter AC Output | Outlet INV | OutletInUse | ✅ | Read |
307
+ | Inverter AC Input | Outlet INV | Input Consumption, W | 🔲 | Read |
308
+ | Inverter AC Output | Outlet INV | Output Consumption, W | 🔲 | Read |
309
+ | Solar | Outlet PV | On | ✅ | Read (Solar Generation > 0: ON) |
310
+ | Solar Generation | Outlet PV | OutletInUse | ✅ | Read |
311
+ | Solar Generation | Outlet PV | Output Consumption, W | 🔲 | Read |
312
+ | Battery | Outlet BAT | On | ✅ | Read (Battery Discharging > 0: ON) |
313
+ | Battery Discharging | Outlet BAT | OutletInUse | ✅ | Read |
314
+ | Battery Level | Outlet BAT | Battery Level, % | 🔲 | Read |
315
+ | Battery Charging | Outlet BAT | Input Consumption, W | 🔲 | Read |
316
+ | Battery Discharging | Outlet BAT | Output Consumption, W | 🔲 | Read |
317
+ | Battery Charging State | Outlet BAT | ChargingState, Yes/No | 🔲 | Read |
318
+ | Battery Level | Outlet BAT | StatusLowBattery, Yes/No | 🔲 | Read |
319
+ | Lighting brightness | Lightbulb | On | ✅ | Read (> 0%: ON; 0%: OFF) / write (ON: 100%; OFF: 0%) |
320
+ | Lighting brightness | Lightbulb | Brightness | ✅ | Read/write |
321
+ | Power demand | Fan | On | ✅ | Read (> 0%: ON; 0%: OFF) / write (ON: 100%; OFF: 0%) |
322
+ | Power demand | Fan | RotationSpeed | ✅ | Read/write |
193
323
 
194
324
  #### Configuration
195
325
 
@@ -200,6 +330,8 @@ The following additional characteristics is available:
200
330
  - Input Consumption, W
201
331
  - Output Consumption, W
202
332
  - Battery Level, %
333
+ - Charging State
334
+ - Status Low Battery
203
335
  - pv:
204
336
  - Output Consumption, W
205
337
  - inverter:
@@ -218,7 +350,9 @@ The following additional characteristics is available:
218
350
  "batteryAdditionalCharacteristics": [
219
351
  "Battery Level, %",
220
352
  "Input Consumption, W",
221
- "Output Consumption, W"
353
+ "Output Consumption, W",
354
+ "Charging State",
355
+ "Status Low Battery"
222
356
  ],
223
357
  "pvAdditionalCharacteristics": [
224
358
  "Output Consumption, W"
@@ -84,7 +84,13 @@
84
84
  "items": {
85
85
  "title": "Characteristic",
86
86
  "type": "string",
87
- "enum": ["Battery Level, %", "Input Consumption, W", "Output Consumption, W"]
87
+ "enum": [
88
+ "Battery Level, %",
89
+ "Input Consumption, W",
90
+ "Output Consumption, W",
91
+ "Charging State",
92
+ "Status Low Battery"
93
+ ]
88
94
  }
89
95
  }
90
96
  }
@@ -109,7 +115,13 @@
109
115
  "items": {
110
116
  "title": "Characteristic",
111
117
  "type": "string",
112
- "enum": ["Battery Level, %", "Input Consumption, W", "Output Consumption, W"]
118
+ "enum": [
119
+ "Battery Level, %",
120
+ "Input Consumption, W",
121
+ "Output Consumption, W",
122
+ "Charging State",
123
+ "Status Low Battery"
124
+ ]
113
125
  }
114
126
  },
115
127
  "pvAdditionalCharacteristics": {
@@ -0,0 +1,10 @@
1
+ import { Delta2AccessoryBase } from '@ecoflow/accessories/batteries/delta2/delta2AccessoryBase';
2
+ import { EcoFlowHttpApiManager } from '@ecoflow/apis/ecoFlowHttpApiManager';
3
+ import { EcoFlowMqttApiManager } from '@ecoflow/apis/ecoFlowMqttApiManager';
4
+ import { DeviceConfig } from '@ecoflow/config';
5
+ import { BatteryStatusProvider } from '@ecoflow/helpers/batteryStatusProvider';
6
+ import { EcoFlowHomebridgePlatform } from '@ecoflow/platform';
7
+ import { Logging, PlatformAccessory } from 'homebridge';
8
+ export declare class Delta2Accessory extends Delta2AccessoryBase {
9
+ constructor(platform: EcoFlowHomebridgePlatform, accessory: PlatformAccessory, config: DeviceConfig, log: Logging, httpApiManager: EcoFlowHttpApiManager, mqttApiManager: EcoFlowMqttApiManager, batteryStatusProvider: BatteryStatusProvider);
10
+ }
@@ -0,0 +1,14 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.Delta2Accessory = void 0;
4
+ const delta2AccessoryBase_1 = require("@ecoflow/accessories/batteries/delta2/delta2AccessoryBase");
5
+ const delta2MqttApiContracts_1 = require("@ecoflow/accessories/batteries/delta2/interfaces/delta2MqttApiContracts");
6
+ class Delta2Accessory extends delta2AccessoryBase_1.Delta2AccessoryBase {
7
+ constructor(platform, accessory, config, log, httpApiManager, mqttApiManager, batteryStatusProvider) {
8
+ super(platform, accessory, config, log, httpApiManager, mqttApiManager, batteryStatusProvider, {
9
+ setAcModuleType: delta2MqttApiContracts_1.Delta2MqttSetModuleType.MPPT,
10
+ });
11
+ }
12
+ }
13
+ exports.Delta2Accessory = Delta2Accessory;
14
+ //# sourceMappingURL=delta2Accessory.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"delta2Accessory.js","sourceRoot":"","sources":["../../../../src/accessories/batteries/delta2/delta2Accessory.ts"],"names":[],"mappings":";;;AAAA,mGAAgG;AAChG,oHAAkH;AAQlH,MAAa,eAAgB,SAAQ,yCAAmB;IACtD,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,EAAE,qBAAqB,EAAE;YAC7F,eAAe,EAAE,gDAAuB,CAAC,IAAI;SAC9C,CAAC,CAAC;IACL,CAAC;CACF;AAdD,0CAcC"}
@@ -0,0 +1,32 @@
1
+ import { Delta2Configuration } from '@ecoflow/accessories/batteries/delta2/interfaces/delta2Configuration';
2
+ import { Delta2AllQuotaData } from '@ecoflow/accessories/batteries/delta2/interfaces/delta2HttpApiContracts';
3
+ import { EcoFlowAccessoryWithQuotaBase } from '@ecoflow/accessories/ecoFlowAccessoryWithQuotaBase';
4
+ import { EcoFlowHttpApiManager } from '@ecoflow/apis/ecoFlowHttpApiManager';
5
+ import { EcoFlowMqttApiManager } from '@ecoflow/apis/ecoFlowMqttApiManager';
6
+ import { MqttQuotaMessage } from '@ecoflow/apis/interfaces/mqttApiContracts';
7
+ import { DeviceConfig } from '@ecoflow/config';
8
+ import { BatteryStatusProvider } from '@ecoflow/helpers/batteryStatusProvider';
9
+ import { EcoFlowHomebridgePlatform } from '@ecoflow/platform';
10
+ import { ServiceBase } from '@ecoflow/services/serviceBase';
11
+ import { Logging, PlatformAccessory } from 'homebridge';
12
+ export declare abstract class Delta2AccessoryBase extends EcoFlowAccessoryWithQuotaBase<Delta2AllQuotaData> {
13
+ private readonly batteryStatusService;
14
+ private readonly outletUsbService;
15
+ private readonly outletAcService;
16
+ private readonly outletCarService;
17
+ private readonly switchXboostService;
18
+ constructor(platform: EcoFlowHomebridgePlatform, accessory: PlatformAccessory, config: DeviceConfig, log: Logging, httpApiManager: EcoFlowHttpApiManager, mqttApiManager: EcoFlowMqttApiManager, batteryStatusProvider: BatteryStatusProvider, configuration: Delta2Configuration);
19
+ protected getServices(): ServiceBase[];
20
+ protected processQuotaMessage(message: MqttQuotaMessage): void;
21
+ protected initializeQuota(quota: Delta2AllQuotaData | null): Delta2AllQuotaData;
22
+ protected updateInitialValues(initialData: Delta2AllQuotaData): void;
23
+ private updateEmsInitialValues;
24
+ private updateInvInitialValues;
25
+ private updatePdInitialValues;
26
+ private updateMpptInitialValues;
27
+ private updateEmsValues;
28
+ private updateInvValues;
29
+ private updatePdValues;
30
+ private updateMpptValues;
31
+ private updateAcValues;
32
+ }
@@ -1,44 +1,59 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.BatteryAccessoryBase = void 0;
4
- const mqttApiBatteryContracts_1 = require("@ecoflow/accessories/batteries/interfaces/mqttApiBatteryContracts");
5
- const outletAcService_1 = require("@ecoflow/accessories/batteries/services/outletAcService");
6
- const outletCarService_1 = require("@ecoflow/accessories/batteries/services/outletCarService");
7
- const outletUsbService_1 = require("@ecoflow/accessories/batteries/services/outletUsbService");
3
+ exports.Delta2AccessoryBase = void 0;
4
+ const delta2MqttApiContracts_1 = require("@ecoflow/accessories/batteries/delta2/interfaces/delta2MqttApiContracts");
5
+ const outletAcService_1 = require("@ecoflow/accessories/batteries/delta2/services/outletAcService");
6
+ const outletCarService_1 = require("@ecoflow/accessories/batteries/delta2/services/outletCarService");
7
+ const outletUsbService_1 = require("@ecoflow/accessories/batteries/delta2/services/outletUsbService");
8
+ const switchXboostService_1 = require("@ecoflow/accessories/batteries/delta2/services/switchXboostService");
9
+ const batteryHttpApiContracts_1 = require("@ecoflow/accessories/batteries/interfaces/batteryHttpApiContracts");
8
10
  const ecoFlowAccessoryWithQuotaBase_1 = require("@ecoflow/accessories/ecoFlowAccessoryWithQuotaBase");
9
11
  const batteryStatusService_1 = require("@ecoflow/services/batteryStatusService");
10
- class BatteryAccessoryBase extends ecoFlowAccessoryWithQuotaBase_1.EcoFlowAccessoryWithQuotaBase {
11
- batteryService;
12
+ class Delta2AccessoryBase extends ecoFlowAccessoryWithQuotaBase_1.EcoFlowAccessoryWithQuotaBase {
13
+ batteryStatusService;
12
14
  outletUsbService;
13
15
  outletAcService;
14
16
  outletCarService;
15
- constructor(platform, accessory, config, log, httpApiManager, mqttApiManager) {
17
+ switchXboostService;
18
+ constructor(platform, accessory, config, log, httpApiManager, mqttApiManager, batteryStatusProvider, configuration) {
16
19
  super(platform, accessory, config, log, httpApiManager, mqttApiManager);
17
- this.batteryService = new batteryStatusService_1.BatteryStatusService(this);
18
- this.outletUsbService = new outletUsbService_1.OutletUsbService(this);
19
- this.outletAcService = new outletAcService_1.OutletAcService(this);
20
- this.outletCarService = new outletCarService_1.OutletCarService(this);
20
+ this.batteryStatusService = new batteryStatusService_1.BatteryStatusService(this, batteryStatusProvider);
21
+ this.outletUsbService = new outletUsbService_1.OutletUsbService(this, batteryStatusProvider);
22
+ this.outletAcService = new outletAcService_1.OutletAcService(this, batteryStatusProvider, configuration.setAcModuleType);
23
+ this.outletCarService = new outletCarService_1.OutletCarService(this, batteryStatusProvider);
24
+ this.switchXboostService = new switchXboostService_1.SwitchXboostService(this, configuration.setAcModuleType);
21
25
  }
22
26
  getServices() {
23
- return [this.batteryService, this.outletUsbService, this.outletAcService, this.outletCarService];
27
+ return [
28
+ this.batteryStatusService,
29
+ this.outletUsbService,
30
+ this.outletAcService,
31
+ this.outletCarService,
32
+ this.switchXboostService,
33
+ ];
24
34
  }
25
35
  processQuotaMessage(message) {
26
36
  const batteryMessage = message;
27
- if (batteryMessage.typeCode === mqttApiBatteryContracts_1.MqttBatteryMessageType.EMS) {
37
+ if (batteryMessage.typeCode === delta2MqttApiContracts_1.Delta2MqttMessageType.EMS) {
28
38
  const emsStatus = message.params;
29
39
  Object.assign(this.quota.bms_emsStatus, emsStatus);
30
40
  this.updateEmsValues(emsStatus);
31
41
  }
32
- else if (batteryMessage.typeCode === mqttApiBatteryContracts_1.MqttBatteryMessageType.INV) {
42
+ else if (batteryMessage.typeCode === delta2MqttApiContracts_1.Delta2MqttMessageType.INV) {
33
43
  const invStatus = message.params;
34
44
  Object.assign(this.quota.inv, invStatus);
35
45
  this.updateInvValues(invStatus);
36
46
  }
37
- else if (batteryMessage.typeCode === mqttApiBatteryContracts_1.MqttBatteryMessageType.PD) {
47
+ else if (batteryMessage.typeCode === delta2MqttApiContracts_1.Delta2MqttMessageType.PD) {
38
48
  const pdStatus = message.params;
39
49
  Object.assign(this.quota.pd, pdStatus);
40
50
  this.updatePdValues(pdStatus);
41
51
  }
52
+ else if (batteryMessage.typeCode === delta2MqttApiContracts_1.Delta2MqttMessageType.MPPT) {
53
+ const mpptStatus = message.params;
54
+ Object.assign(this.quota.mppt, mpptStatus);
55
+ this.updateMpptValues(mpptStatus);
56
+ }
42
57
  }
43
58
  initializeQuota(quota) {
44
59
  const result = quota ?? {};
@@ -51,65 +66,78 @@ class BatteryAccessoryBase extends ecoFlowAccessoryWithQuotaBase_1.EcoFlowAccess
51
66
  if (!result.pd) {
52
67
  result.pd = {};
53
68
  }
69
+ if (!result.mppt) {
70
+ result.mppt = {};
71
+ }
54
72
  return result;
55
73
  }
56
74
  updateInitialValues(initialData) {
57
75
  this.updateEmsInitialValues(initialData.bms_emsStatus);
58
76
  this.updateInvInitialValues(initialData.inv);
59
77
  this.updatePdInitialValues(initialData.pd);
78
+ this.updateMpptInitialValues(initialData.mppt);
60
79
  }
61
80
  updateEmsInitialValues(params) {
62
81
  const message = {
63
- typeCode: mqttApiBatteryContracts_1.MqttBatteryMessageType.EMS,
82
+ typeCode: delta2MqttApiContracts_1.Delta2MqttMessageType.EMS,
64
83
  params,
65
84
  };
66
85
  this.processQuotaMessage(message);
67
86
  }
68
87
  updateInvInitialValues(params) {
69
88
  const message = {
70
- typeCode: mqttApiBatteryContracts_1.MqttBatteryMessageType.INV,
89
+ typeCode: delta2MqttApiContracts_1.Delta2MqttMessageType.INV,
71
90
  params,
72
91
  };
73
92
  this.processQuotaMessage(message);
74
93
  }
75
94
  updatePdInitialValues(params) {
76
95
  const message = {
77
- typeCode: mqttApiBatteryContracts_1.MqttBatteryMessageType.PD,
96
+ typeCode: delta2MqttApiContracts_1.Delta2MqttMessageType.PD,
97
+ params,
98
+ };
99
+ this.processQuotaMessage(message);
100
+ }
101
+ updateMpptInitialValues(params) {
102
+ const message = {
103
+ typeCode: delta2MqttApiContracts_1.Delta2MqttMessageType.MPPT,
78
104
  params,
79
105
  };
80
106
  this.processQuotaMessage(message);
81
107
  }
82
108
  updateEmsValues(params) {
83
- if (params.f32LcdShowSoc !== undefined) {
84
- this.batteryService.updateBatteryLevel(params.f32LcdShowSoc);
85
- this.outletAcService.updateBatteryLevel(params.f32LcdShowSoc);
86
- this.outletUsbService.updateBatteryLevel(params.f32LcdShowSoc);
87
- this.outletCarService.updateBatteryLevel(params.f32LcdShowSoc);
109
+ if (params.f32LcdShowSoc !== undefined && params.minDsgSoc !== undefined) {
110
+ this.batteryStatusService.updateBatteryLevel(params.f32LcdShowSoc, params.minDsgSoc);
111
+ this.outletAcService.updateBatteryLevel(params.f32LcdShowSoc, params.minDsgSoc);
112
+ this.outletUsbService.updateBatteryLevel(params.f32LcdShowSoc, params.minDsgSoc);
113
+ this.outletCarService.updateBatteryLevel(params.f32LcdShowSoc, params.minDsgSoc);
88
114
  }
89
115
  }
90
116
  updateInvValues(params) {
91
117
  if (params.inputWatts !== undefined) {
92
- this.batteryService.updateChargingState(params.inputWatts);
118
+ const isCharging = params.inputWatts > 0 && (params.outputWatts === undefined || params.inputWatts !== params.outputWatts);
119
+ this.batteryStatusService.updateChargingState(isCharging);
120
+ this.outletAcService.updateChargingState(isCharging);
121
+ this.outletUsbService.updateChargingState(isCharging);
122
+ this.outletCarService.updateChargingState(isCharging);
93
123
  this.outletAcService.updateInputConsumption(params.inputWatts);
94
124
  this.outletUsbService.updateInputConsumption(params.inputWatts);
95
125
  this.outletCarService.updateInputConsumption(params.inputWatts);
96
126
  }
97
- if (params.cfgAcEnabled !== undefined) {
98
- this.outletAcService.updateState(params.cfgAcEnabled);
99
- }
100
127
  if (params.outputWatts !== undefined) {
101
128
  this.outletAcService.updateOutputConsumption(params.outputWatts);
102
129
  }
130
+ this.updateAcValues(params);
103
131
  }
104
132
  updatePdValues(params) {
105
133
  if (params.carState !== undefined) {
106
- this.outletCarService.updateState(params.carState);
134
+ this.outletCarService.updateState(params.carState === batteryHttpApiContracts_1.EnableType.On);
107
135
  }
108
136
  if (params.carWatts !== undefined) {
109
137
  this.outletCarService.updateOutputConsumption(params.carWatts);
110
138
  }
111
139
  if (params.dcOutState !== undefined) {
112
- this.outletUsbService.updateState(params.dcOutState);
140
+ this.outletUsbService.updateState(params.dcOutState === batteryHttpApiContracts_1.EnableType.On);
113
141
  }
114
142
  if (params.usb1Watts !== undefined ||
115
143
  params.usb2Watts !== undefined ||
@@ -121,6 +149,17 @@ class BatteryAccessoryBase extends ecoFlowAccessoryWithQuotaBase_1.EcoFlowAccess
121
149
  this.outletUsbService.updateOutputConsumption(usbWatts);
122
150
  }
123
151
  }
152
+ updateMpptValues(params) {
153
+ this.updateAcValues(params);
154
+ }
155
+ updateAcValues(params) {
156
+ if (params.cfgAcEnabled !== undefined && params.cfgAcEnabled !== batteryHttpApiContracts_1.AcEnableType.Ignore) {
157
+ this.outletAcService.updateState(params.cfgAcEnabled === batteryHttpApiContracts_1.AcEnableType.On);
158
+ }
159
+ if (params.cfgAcXboost !== undefined && params.cfgAcXboost !== batteryHttpApiContracts_1.AcXBoostType.Ignore) {
160
+ this.switchXboostService.updateState(params.cfgAcXboost === batteryHttpApiContracts_1.AcXBoostType.On);
161
+ }
162
+ }
124
163
  }
125
- exports.BatteryAccessoryBase = BatteryAccessoryBase;
126
- //# sourceMappingURL=batteryAccessoryBase.js.map
164
+ exports.Delta2AccessoryBase = Delta2AccessoryBase;
165
+ //# sourceMappingURL=delta2AccessoryBase.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"delta2AccessoryBase.js","sourceRoot":"","sources":["../../../../src/accessories/batteries/delta2/delta2AccessoryBase.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,10 @@
1
+ import { Delta2AccessoryBase } from '@ecoflow/accessories/batteries/delta2/delta2AccessoryBase';
2
+ import { EcoFlowHttpApiManager } from '@ecoflow/apis/ecoFlowHttpApiManager';
3
+ import { EcoFlowMqttApiManager } from '@ecoflow/apis/ecoFlowMqttApiManager';
4
+ import { DeviceConfig } from '@ecoflow/config';
5
+ import { BatteryStatusProvider } from '@ecoflow/helpers/batteryStatusProvider';
6
+ import { EcoFlowHomebridgePlatform } from '@ecoflow/platform';
7
+ import { Logging, PlatformAccessory } from 'homebridge';
8
+ export declare class Delta2MaxAccessory extends Delta2AccessoryBase {
9
+ constructor(platform: EcoFlowHomebridgePlatform, accessory: PlatformAccessory, config: DeviceConfig, log: Logging, httpApiManager: EcoFlowHttpApiManager, mqttApiManager: EcoFlowMqttApiManager, batteryStatusProvider: BatteryStatusProvider);
10
+ }
@@ -0,0 +1,14 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.Delta2MaxAccessory = void 0;
4
+ const delta2AccessoryBase_1 = require("@ecoflow/accessories/batteries/delta2/delta2AccessoryBase");
5
+ const delta2MqttApiContracts_1 = require("@ecoflow/accessories/batteries/delta2/interfaces/delta2MqttApiContracts");
6
+ class Delta2MaxAccessory extends delta2AccessoryBase_1.Delta2AccessoryBase {
7
+ constructor(platform, accessory, config, log, httpApiManager, mqttApiManager, batteryStatusProvider) {
8
+ super(platform, accessory, config, log, httpApiManager, mqttApiManager, batteryStatusProvider, {
9
+ setAcModuleType: delta2MqttApiContracts_1.Delta2MqttSetModuleType.INV,
10
+ });
11
+ }
12
+ }
13
+ exports.Delta2MaxAccessory = Delta2MaxAccessory;
14
+ //# sourceMappingURL=delta2MaxAccessory.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"delta2MaxAccessory.js","sourceRoot":"","sources":["../../../../src/accessories/batteries/delta2/delta2MaxAccessory.ts"],"names":[],"mappings":";;;AAAA,mGAAgG;AAChG,oHAAkH;AAQlH,MAAa,kBAAmB,SAAQ,yCAAmB;IACzD,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,EAAE,qBAAqB,EAAE;YAC7F,eAAe,EAAE,gDAAuB,CAAC,GAAG;SAC7C,CAAC,CAAC;IACL,CAAC;CACF;AAdD,gDAcC"}
@@ -0,0 +1,4 @@
1
+ import { Delta2MqttSetModuleType } from '@ecoflow/accessories/batteries/delta2/interfaces/delta2MqttApiContracts';
2
+ export interface Delta2Configuration {
3
+ setAcModuleType: Delta2MqttSetModuleType;
4
+ }
@@ -1,3 +1,3 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- //# sourceMappingURL=httpApiBatteryContracts.js.map
3
+ //# sourceMappingURL=delta2Configuration.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"delta2Configuration.js","sourceRoot":"","sources":["../../../../../src/accessories/batteries/delta2/interfaces/delta2Configuration.ts"],"names":[],"mappings":""}