Additional EP600 values
Added Consumption and Grid, Consumption and Solar in Totals
This commit is contained in:
1 parent
0cd5ae10fb
commit
e584d32037
8 files changed
+83
No files matched your search
Generated
+3
@@ -0,0 +1,3 @@
|
|||||||
|
# Default ignored files
|
||||||
|
/shelf/
|
||||||
|
/workspace.xml
|
||||||
Generated
+12
@@ -0,0 +1,12 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<module type="PYTHON_MODULE" version="4">
|
||||||
|
<component name="NewModuleRootManager">
|
||||||
|
<content url="file://$MODULE_DIR$" />
|
||||||
|
<orderEntry type="inheritedJdk" />
|
||||||
|
<orderEntry type="sourceFolder" forTests="false" />
|
||||||
|
</component>
|
||||||
|
<component name="PyDocumentationSettings">
|
||||||
|
<option name="format" value="PLAIN" />
|
||||||
|
<option name="myDocStringFormat" value="Plain" />
|
||||||
|
</component>
|
||||||
|
</module>
|
||||||
+6
@@ -0,0 +1,6 @@
|
|||||||
|
<component name="InspectionProjectProfileManager">
|
||||||
|
<settings>
|
||||||
|
<option name="USE_PROJECT_PROFILE" value="false" />
|
||||||
|
<version value="1.0" />
|
||||||
|
</settings>
|
||||||
|
</component>
|
||||||
Generated
+7
@@ -0,0 +1,7 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<project version="4">
|
||||||
|
<component name="Black">
|
||||||
|
<option name="sdkName" value="Python 3.11" />
|
||||||
|
</component>
|
||||||
|
<component name="ProjectRootManager" version="2" project-jdk-name="Python 3.11" project-jdk-type="Python SDK" />
|
||||||
|
</project>
|
||||||
Generated
+8
@@ -0,0 +1,8 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<project version="4">
|
||||||
|
<component name="ProjectModuleManager">
|
||||||
|
<modules>
|
||||||
|
<module fileurl="file://$PROJECT_DIR$/.idea/hassio-bluetti-bt-KM1.iml" filepath="$PROJECT_DIR$/.idea/hassio-bluetti-bt-KM1.iml" />
|
||||||
|
</modules>
|
||||||
|
</component>
|
||||||
|
</project>
|
||||||
Generated
+6
@@ -0,0 +1,6 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<project version="4">
|
||||||
|
<component name="VcsDirectoryMappings">
|
||||||
|
<mapping directory="" vcs="Git" />
|
||||||
|
</component>
|
||||||
|
</project>
|
||||||
@@ -62,6 +62,22 @@ class EP600(ProtocolV2Device):
|
|||||||
self.struct.add_decimal_field("ac_output_current_phase2", 1519, 1)
|
self.struct.add_decimal_field("ac_output_current_phase2", 1519, 1)
|
||||||
self.struct.add_decimal_field("ac_output_current_phase3", 1526, 1)
|
self.struct.add_decimal_field("ac_output_current_phase3", 1526, 1)
|
||||||
|
|
||||||
|
# KM - Consumption
|
||||||
|
self.struct.add_int_field("consumption_power_phase1", 1430)
|
||||||
|
self.struct.add_int_field("consumption_power_phase2", 1436)
|
||||||
|
self.struct.add_int_field("consumption_power_phase3", 1442)
|
||||||
|
self.struct.add_decimal_field("consumption_voltage_phase1", 1431, 1)
|
||||||
|
self.struct.add_decimal_field("consumption_voltage_phase2", 1437, 1)
|
||||||
|
self.struct.add_decimal_field("consumption_voltage_phase3", 1443, 1)
|
||||||
|
self.struct.add_decimal_field("consumption_current_phase1", 1432, 1)
|
||||||
|
self.struct.add_decimal_field("consumption_current_phase2", 1438, 1)
|
||||||
|
self.struct.add_decimal_field("consumption_current_phase3", 1444, 1)
|
||||||
|
|
||||||
|
# KM - Totals
|
||||||
|
self.struct.add_uint_field('pv_input_power_all', 144) # Total PV in
|
||||||
|
self.struct.add_uint_field('consumption_power_all', 142) # Total AC out
|
||||||
|
self.struct.add_uint_field('grid_power_all', 146) # Total Grid in - value only +/- unknown
|
||||||
|
|
||||||
# Statistics
|
# Statistics
|
||||||
self.struct.add_decimal_field(
|
self.struct.add_decimal_field(
|
||||||
"total_ac_consumption", 152, 1
|
"total_ac_consumption", 152, 1
|
||||||
@@ -100,4 +116,9 @@ class EP600(ProtocolV2Device):
|
|||||||
ReadHoldingRegisters(152, 1),
|
ReadHoldingRegisters(152, 1),
|
||||||
ReadHoldingRegisters(156, 1),
|
ReadHoldingRegisters(156, 1),
|
||||||
ReadHoldingRegisters(158, 1),
|
ReadHoldingRegisters(158, 1),
|
||||||
|
# KM - Consumption
|
||||||
|
ReadHoldingRegisters(1430, 15),
|
||||||
|
# KM - Totals
|
||||||
|
ReadHoldingRegisters(142, 5),
|
||||||
|
|
||||||
]
|
]
|
||||||
@@ -217,6 +217,26 @@ FIELD_ATTRIBUTES: dict[str, FieldAttributes] = {
|
|||||||
"total_ac_consumption": EnergyFieldAttributes("Total Load Consumption"),
|
"total_ac_consumption": EnergyFieldAttributes("Total Load Consumption"),
|
||||||
"total_grid_consumption": EnergyFieldAttributes("Total Grid Consumption"),
|
"total_grid_consumption": EnergyFieldAttributes("Total Grid Consumption"),
|
||||||
"total_grid_feed": EnergyFieldAttributes("Total Grid Feed"),
|
"total_grid_feed": EnergyFieldAttributes("Total Grid Feed"),
|
||||||
|
|
||||||
|
# KM - Consumption
|
||||||
|
"consumption_power_phase1": PowerFieldAttributes("Consumption Power Phase 1"),
|
||||||
|
"consumption_power_phase2": PowerFieldAttributes("Consumption Power Phase 2"),
|
||||||
|
"consumption_power_phase3": PowerFieldAttributes("Consumption Power Phase 3"),
|
||||||
|
"consumption_voltage_phase1": VoltageFieldAttributes("Consumption Voltage Phase 1"),
|
||||||
|
"consumption_voltage_phase2": VoltageFieldAttributes("Consumption Voltage Phase 2"),
|
||||||
|
"consumption_voltage_phase3": VoltageFieldAttributes("Consumption Voltage Phase 3"),
|
||||||
|
"consumption_current_phase1": CurrentFieldAttributes("Consumption Current Phase 1"),
|
||||||
|
"consumption_current_phase2": CurrentFieldAttributes("Consumption Current Phase 2"),
|
||||||
|
"consumption_current_phase3": CurrentFieldAttributes("Consumption Current Phase 3"),
|
||||||
|
# KM - Consumption end
|
||||||
|
|
||||||
|
# KM - Totals
|
||||||
|
"pv_input_power_all": PowerFieldAttributes("PV Input Power All"),
|
||||||
|
"consumption_power_all": PowerFieldAttributes("Consumption Power All"),
|
||||||
|
"grid_power_all": PowerFieldAttributes("Grid Power All"),
|
||||||
|
# KM - Totals end
|
||||||
|
|
||||||
|
|
||||||
# Device specific controls
|
# Device specific controls
|
||||||
"power_off": FieldAttributes(
|
"power_off": FieldAttributes(
|
||||||
type=FieldType.BOOL,
|
type=FieldType.BOOL,
|
||||||
|
|||||||
Reference in new issue
Block a user