Merge pull request #71 from Patrick762/bugfixes

Bugfixes and improvements
Patrick762 · Mar 12, 2024 · f8ed814 · f8ed814
2 parents 98d2a0b + bf86fe1
commit f8ed814
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 14 deletions.
diff --git a/custom_components/bluetti_bt/bluetti_bt_lib/base_devices/ProtocolV1Device.py b/custom_components/bluetti_bt/bluetti_bt_lib/base_devices/ProtocolV1Device.py
@@ -64,7 +64,7 @@ def polling_commands(self) -> List[ReadHoldingRegisters]:
 
     @property
     def writable_ranges(self) -> List[range]:
-        return [range(3006, 3008)]
+        return [range(3006, 3009)]
 
     @property
     def pack_polling_commands(self) -> List[ReadHoldingRegisters]:

diff --git a/custom_components/bluetti_bt/bluetti_bt_lib/devices/ac300.py b/custom_components/bluetti_bt/bluetti_bt_lib/devices/ac300.py
@@ -58,7 +58,7 @@ def polling_commands(self) -> List[ReadHoldingRegisters]:
     def writable_ranges(self) -> List[range]:
         return super().writable_ranges + [
             range(3001, 3016),
-            3061,
+            range(3061),
         ]
 
     @property

diff --git a/custom_components/bluetti_bt/bluetti_bt_lib/devices/ac500.py b/custom_components/bluetti_bt/bluetti_bt_lib/devices/ac500.py
@@ -57,7 +57,7 @@ def polling_commands(self) -> List[ReadHoldingRegisters]:
     def writable_ranges(self) -> List[range]:
         return super().writable_ranges + [
             range(3001, 3016),
-            3061,
+            range(3061),
         ]
 
     @property

diff --git a/custom_components/bluetti_bt/bluetti_bt_lib/devices/eb3a.py b/custom_components/bluetti_bt/bluetti_bt_lib/devices/eb3a.py
@@ -28,12 +28,15 @@ def polling_commands(self) -> List[ReadHoldingRegisters]:
         return super().polling_commands + [
             ReadHoldingRegisters(77, 1),
             ReadHoldingRegisters(86, 1),
+            ReadHoldingRegisters(3034, 1),
+            ReadHoldingRegisters(3060, 1),
+            ReadHoldingRegisters(3063, 5),
         ]
 
     @property
     def writable_ranges(self) -> List[range]:
         return super().writable_ranges + [
-            3034,
-            3060,
-            range(3063, 3066),
+            range(3034, 3035),
+            range(3060, 3061),
+            range(3063, 3067),
         ]
diff --git a/custom_components/bluetti_bt/bluetti_bt_lib/devices/ep500.py b/custom_components/bluetti_bt/bluetti_bt_lib/devices/ep500.py
@@ -53,7 +53,7 @@ def polling_commands(self) -> List[ReadHoldingRegisters]:
     def writable_ranges(self) -> List[range]:
         return super().writable_ranges + [
             range(3001, 3016),
-            3061,
+            range(3061),
         ]
 
     @property

diff --git a/custom_components/bluetti_bt/bluetti_bt_lib/devices/ep500p.py b/custom_components/bluetti_bt/bluetti_bt_lib/devices/ep500p.py
@@ -53,7 +53,7 @@ def polling_commands(self) -> List[ReadHoldingRegisters]:
     def writable_ranges(self) -> List[range]:
         return super().writable_ranges + [
             range(3001, 3016),
-            3061,
+            range(3061),
         ]
 
     @property

diff --git a/custom_components/bluetti_bt/bluetti_bt_lib/field_attributes.py b/custom_components/bluetti_bt/bluetti_bt_lib/field_attributes.py
@@ -18,7 +18,6 @@ class FieldType(Enum):
     NUMERIC = auto()
     BOOL = auto()
     ENUM = auto()
-    BUTTON = auto()
 
 
 class FieldAttributes:
@@ -220,7 +219,7 @@ def __init__(
     "total_grid_feed": EnergyFieldAttributes("Total Grid Feed"),
     # Device specific controls
     "power_off": FieldAttributes(
-        type=FieldType.BUTTON,
+        type=FieldType.BOOL,
         setter=True,
         name="Power Off",
     ),
@@ -294,7 +293,7 @@ def __init__(
     ),
     "power_lifting_on": FieldAttributes(
         type=FieldType.BOOL,
-        setter=False,  # Disabled for safety reasons
+        setter=True,
         name="Power Lifting",
     ),
 }

diff --git a/custom_components/bluetti_bt/const.py b/custom_components/bluetti_bt/const.py
@@ -26,8 +26,11 @@
 ]
 
 CONTROL_FIELDS = [
-    "ac_output_on",
-    "dc_output_on",
+    "ac_output_on_switch",
+    "dc_output_on_switch",
+    "power_off",
+    "eco_on",
+    "power_lifting_on",
 ]
 
 DIAGNOSTIC_FIELDS = [

diff --git a/custom_components/bluetti_bt/manifest.json b/custom_components/bluetti_bt/manifest.json
@@ -22,5 +22,5 @@
     "iot_class": "local_polling",
     "issue_tracker": "https://github.com/Patrick762/hassio-bluetti-bt/issues",
     "requirements": [],
-    "version": "0.0.19"
+    "version": "0.0.20"
 }