Merge pull request #66 from Patrick762/ac180-ac180p

AC180 AC180P

README.md

@@ -17,6 +17,8 @@ After the installation, you can use this button to install the integration:
 ### Supported devices:
 
 - AC60
+- AC180 (basic data)
+- AC180P (basic data)
 - AC200M
 - AC300 (tested)
 - AC500
@@ -24,7 +26,8 @@ After the installation, you can use this button to install the integration:
 - EP500
 - EP500P
 - EP600 (tested)
-- EP760 (beta, untested)
+- EP760 (basic data)
+- EP800 (basic data)
 
 ### Available controls:
 If enabled in the Integration options (you need to reload the integration if you change this option):

custom_components/bluetti_bt/bluetti_bt_lib/devices/ac180.py

@@ -0,0 +1,8 @@
+"""AC180 fields."""
+
+from ..base_devices.ProtocolV2Device import ProtocolV2Device
+
+
+class AC180(ProtocolV2Device):
+    def __init__(self, address: str, sn: str):
+        super().__init__(address, "AC180", sn)

custom_components/bluetti_bt/bluetti_bt_lib/devices/ac180p.py

@@ -0,0 +1,8 @@
+"""AC180P fields."""
+
+from ..base_devices.ProtocolV2Device import ProtocolV2Device
+
+
+class AC180P(ProtocolV2Device):
+    def __init__(self, address: str, sn: str):
+        super().__init__(address, "AC180P", sn)

custom_components/bluetti_bt/bluetti_bt_lib/devices/ep600.py

@@ -20,11 +20,11 @@ class EP600(ProtocolV2Device):
 
         # DC Solar
         self.struct.add_uint_field("pv_input_power1", 1212)
-        self.struct.add_uint_field("pv_input_voltage1", 1213)
+        self.struct.add_decimal_field("pv_input_voltage1", 1213, 1)
-        self.struct.add_uint_field("pv_input_current1", 1214)
+        self.struct.add_decimal_field("pv_input_current1", 1214, 1)
         self.struct.add_uint_field("pv_input_power2", 1220)
-        self.struct.add_uint_field("pv_input_voltage2", 1221)
+        self.struct.add_decimal_field("pv_input_voltage2", 1221, 1)
-        self.struct.add_uint_field("pv_input_current2", 1222)
+        self.struct.add_decimal_field("pv_input_current2", 1222, 1)
 
         # ADL400 Smart Meter for AC Solar
         self.struct.add_uint_field("adl400_ac_input_power_phase1", 1228)
@@ -52,9 +52,9 @@ class EP600(ProtocolV2Device):
 
         # EP600 AC Output
         self.struct.add_decimal_field("ac_output_frequency", 1500, 1)
-        self.struct.add_uint_field("ac_output_power_phase1", 1510)
+        self.struct.add_int_field("ac_output_power_phase1", 1510)
-        self.struct.add_uint_field("ac_output_power_phase2", 1517)
+        self.struct.add_int_field("ac_output_power_phase2", 1517)
-        self.struct.add_uint_field("ac_output_power_phase3", 1524)
+        self.struct.add_int_field("ac_output_power_phase3", 1524)
         self.struct.add_decimal_field("ac_output_voltage_phase1", 1511, 1)
         self.struct.add_decimal_field("ac_output_voltage_phase2", 1518, 1)
         self.struct.add_decimal_field("ac_output_voltage_phase3", 1525, 1)

custom_components/bluetti_bt/bluetti_bt_lib/devices/ep800.py

@@ -0,0 +1,8 @@
+"""EP800 fields."""
+
+from ..base_devices.ProtocolV2Device import ProtocolV2Device
+
+
+class EP800(ProtocolV2Device):
+    def __init__(self, address: str, sn: str):
+        super().__init__(address, "EP800", sn)

custom_components/bluetti_bt/bluetti_bt_lib/utils/device_builder.py

@@ -3,6 +3,8 @@
 import re
 
 from ..devices.ac60 import AC60
+from ..devices.ac180 import AC180
+from ..devices.ac180p import AC180P
 from ..devices.ac200m import AC200M
 from ..devices.ac300 import AC300
 from ..devices.ac500 import AC500
@@ -11,9 +13,10 @@ from ..devices.ep500 import EP500
 from ..devices.ep500p import EP500P
 from ..devices.ep600 import EP600
 from ..devices.ep760 import EP760
+from ..devices.ep800 import EP800
 
 DEVICE_NAME_RE = re.compile(
-    r"^(AC60|AC200M|AC300|AC500|EB3A|EP500|EP500P|EP600|EP760)(\d+)$"
+    r"^(AC60|AC180|AC180P|AC200M|AC300|AC500|EB3A|EP500|EP500P|EP600|EP760|EP800)(\d+)$"
 )
 
 
@@ -21,6 +24,10 @@ def build_device(address: str, name: str):
     match = DEVICE_NAME_RE.match(name)
     if match[1] == "AC60":
         return AC60(address, match[2])
+    if match[1] == "AC180":
+        return AC180(address, match[2])
+    if match[1] == "AC180P":
+        return AC180P(address, match[2])
     if match[1] == "AC200M":
         return AC200M(address, match[2])
     if match[1] == "AC300":
@@ -37,6 +44,8 @@ def build_device(address: str, name: str):
         return EP600(address, match[2])
     if match[1] == "EP760":
         return EP760(address, match[2])
+    if match[1] == "EP800":
+        return EP800(address, match[2])
 
 
 def get_type_by_bt_name(bt_name: str):

custom_components/bluetti_bt/bluetti_bt_lib/utils/struct.py

@@ -44,6 +44,21 @@ class UintField(DeviceField):
             return val >= self.range[0] and val <= self.range[1]
 
 
+class IntField(DeviceField):
+    def __init__(self, name: str, address: int, range: Optional[Tuple[int, int]]):
+        self.range = range
+        super().__init__(name, address, 1)
+
+    def parse(self, data: bytes) -> int:
+        return struct.unpack(">h", data)[0]
+
+    def in_range(self, val: int) -> bool:
+        if self.range is None:
+            return True
+        else:
+            return val >= self.range[0] and val <= self.range[1]
+
+
 class BoolField(DeviceField):
     def __init__(self, name: str, address: int):
         super().__init__(name, address, 1)
@@ -132,6 +147,9 @@ class DeviceStruct:
     def add_uint_field(self, name: str, address: int, range: Tuple[int, int] = None):
         self.fields.append(UintField(name, address, range))
 
+    def add_int_field(self, name: str, address: int, range: Tuple[int, int] = None):
+        self.fields.append(IntField(name, address, range))
+
     def add_bool_field(self, name: str, address: int):
         self.fields.append(BoolField(name, address))
 

custom_components/bluetti_bt/manifest.json

@@ -2,14 +2,16 @@
     "domain": "bluetti_bt",
     "name": "Bluetti BT",
     "bluetooth": [
+        { "local_name": "AC60*" },
+        { "local_name": "AC180*" },
         { "local_name": "AC200M*" },
         { "local_name": "AC300*" },
         { "local_name": "AC500*" },
-        { "local_name": "AC60*" },
         { "local_name": "EB3A*" },
         { "local_name": "EP500*" },
         { "local_name": "EP600*" },
         { "local_name": "EP760*" },
+        { "local_name": "EP800*" },
         { "local_name": "PBOX*" }
     ],
     "codeowners": ["@Patrick762"],
@@ -20,5 +22,5 @@
     "iot_class": "local_polling",
     "issue_tracker": "https://github.com/Patrick762/hassio-bluetti-bt/issues",
     "requirements": [],
-    "version": "0.0.17"
+    "version": "0.0.19"
 }

test.sh

@@ -0,0 +1,4 @@
+#!/bin/sh
+
+# Execute unittests of python library
+python3 -m unittest discover -s tests -p "*_test.py"

tests/device_builder_test.py

@@ -0,0 +1,124 @@
+"""Unittest for device builder."""
+
+import unittest
+
+from custom_components.bluetti_bt.bluetti_bt_lib.utils.device_builder import build_device
+from custom_components.bluetti_bt.bluetti_bt_lib.devices.ac60 import AC60
+from custom_components.bluetti_bt.bluetti_bt_lib.devices.ac180 import AC180
+from custom_components.bluetti_bt.bluetti_bt_lib.devices.ac180p import AC180P
+from custom_components.bluetti_bt.bluetti_bt_lib.devices.ac200m import AC200M
+from custom_components.bluetti_bt.bluetti_bt_lib.devices.ac300 import AC300
+from custom_components.bluetti_bt.bluetti_bt_lib.devices.ac500 import AC500
+from custom_components.bluetti_bt.bluetti_bt_lib.devices.eb3a import EB3A
+from custom_components.bluetti_bt.bluetti_bt_lib.devices.ep500 import EP500
+from custom_components.bluetti_bt.bluetti_bt_lib.devices.ep500p import EP500P
+from custom_components.bluetti_bt.bluetti_bt_lib.devices.ep600 import EP600
+from custom_components.bluetti_bt.bluetti_bt_lib.devices.ep760 import EP760
+from custom_components.bluetti_bt.bluetti_bt_lib.devices.ep800 import EP800
+
+
+class TestDeviceBuilder(unittest.TestCase):
+    def test_build_Unknow(self):
+        bt_addr = "aa:bb:cc:dd:ee:ff"
+        bt_name = "PBOX56786746478"
+        with self.assertRaises(TypeError):
+            build_device(bt_addr, bt_name)
+
+    def test_build_ac60(self):
+        bt_addr = "aa:bb:cc:dd:ee:ff"
+        bt_name = "AC6056786746478"
+        built = build_device(bt_addr, bt_name)
+
+        self.assertIsInstance(built, AC60)
+        self.assertEqual(built.address, bt_addr)
+
+    def test_build_ac180(self):
+        bt_addr = "aa:bb:cc:dd:ee:ff"
+        bt_name = "AC18056786746478"
+        built = build_device(bt_addr, bt_name)
+
+        self.assertIsInstance(built, AC180)
+        self.assertEqual(built.address, bt_addr)
+
+    def test_build_ac180p(self):
+        bt_addr = "aa:bb:cc:dd:ee:ff"
+        bt_name = "AC180P56786746478"
+        built = build_device(bt_addr, bt_name)
+
+        self.assertIsInstance(built, AC180P)
+        self.assertEqual(built.address, bt_addr)
+
+    def test_build_ac200m(self):
+        bt_addr = "aa:bb:cc:dd:ee:ff"
+        bt_name = "AC200M56786746478"
+        built = build_device(bt_addr, bt_name)
+
+        self.assertIsInstance(built, AC200M)
+        self.assertEqual(built.address, bt_addr)
+
+    def test_build_ac300(self):
+        bt_addr = "aa:bb:cc:dd:ee:ff"
+        bt_name = "AC30056786746478"
+        built = build_device(bt_addr, bt_name)
+
+        self.assertIsInstance(built, AC300)
+        self.assertEqual(built.address, bt_addr)
+
+    def test_build_ac500(self):
+        bt_addr = "aa:bb:cc:dd:ee:ff"
+        bt_name = "AC50056786746478"
+        built = build_device(bt_addr, bt_name)
+
+        self.assertIsInstance(built, AC500)
+        self.assertEqual(built.address, bt_addr)
+
+    def test_build_eb3a(self):
+        bt_addr = "aa:bb:cc:dd:ee:ff"
+        bt_name = "EB3A56786746478"
+        built = build_device(bt_addr, bt_name)
+
+        self.assertIsInstance(built, EB3A)
+        self.assertEqual(built.address, bt_addr)
+
+    def test_build_ep500(self):
+        bt_addr = "aa:bb:cc:dd:ee:ff"
+        bt_name = "EP50056786746478"
+        built = build_device(bt_addr, bt_name)
+
+        self.assertIsInstance(built, EP500)
+        self.assertEqual(built.address, bt_addr)
+
+    def test_build_ep500p(self):
+        bt_addr = "aa:bb:cc:dd:ee:ff"
+        bt_name = "EP500P56786746478"
+        built = build_device(bt_addr, bt_name)
+
+        self.assertIsInstance(built, EP500P)
+        self.assertEqual(built.address, bt_addr)
+
+    def test_build_EP600(self):
+        bt_addr = "aa:bb:cc:dd:ee:ff"
+        bt_name = "EP60056786746478"
+        built = build_device(bt_addr, bt_name)
+
+        self.assertIsInstance(built, EP600)
+        self.assertEqual(built.address, bt_addr)
+
+    def test_build_EP760(self):
+        bt_addr = "aa:bb:cc:dd:ee:ff"
+        bt_name = "EP76056786746478"
+        built = build_device(bt_addr, bt_name)
+
+        self.assertIsInstance(built, EP760)
+        self.assertEqual(built.address, bt_addr)
+
+    def test_build_EP800(self):
+        bt_addr = "aa:bb:cc:dd:ee:ff"
+        bt_name = "EP80056786746478"
+        built = build_device(bt_addr, bt_name)
+
+        self.assertIsInstance(built, EP800)
+        self.assertEqual(built.address, bt_addr)
+
+if __name__ == '__main__':
+    unittest.main()