fix: message protocol version default (#316)

midea-lan · Oct 5, 2024 · 2f4e5d1 · 2f4e5d1
1 parent 45f7bd2
commit 2f4e5d1
Show file tree

Hide file tree

Showing 37 changed files with 162 additions and 164 deletions.
diff --git a/midealocal/device.py b/midealocal/device.py
@@ -97,7 +97,7 @@ def __init__(
         self._device_protocol_version = device_protocol
         self._model = model
         self._subtype = subtype
-        self._message_protocol_version: ProtocolVersion = ProtocolVersion.V1
+        self._message_protocol_version: int = 0
         self._updates: list[Callable[[dict[str, Any]], None]] = []
         self._unsupported_protocol: list[str] = []
         self._is_run = False

diff --git a/midealocal/devices/a1/message.py b/midealocal/devices/a1/message.py
@@ -31,7 +31,7 @@ class MessageA1Base(MessageRequest):
 
     def __init__(
         self,
-        protocol_version: ProtocolVersion,
+        protocol_version: int,
         message_type: MessageType,
         body_type: BodyType,
     ) -> None:
@@ -62,7 +62,7 @@ def body(self) -> bytearray:
 class MessageQuery(MessageA1Base):
     """Message A1 query."""
 
-    def __init__(self, protocol_version: ProtocolVersion) -> None:
+    def __init__(self, protocol_version: int) -> None:
         """Initialize message A1 query."""
         super().__init__(
             protocol_version=protocol_version,
@@ -120,7 +120,7 @@ def _body(self) -> bytearray:
 class MessageSet(MessageA1Base):
     """Message A1 set."""
 
-    def __init__(self, protocol_version: ProtocolVersion) -> None:
+    def __init__(self, protocol_version: int) -> None:
         """Initialize message A1 set."""
         super().__init__(
             protocol_version=protocol_version,

diff --git a/midealocal/devices/ac/message.py b/midealocal/devices/ac/message.py
@@ -2,7 +2,7 @@
 
 from enum import IntEnum
 
-from midealocal.const import MAX_BYTE_VALUE, DeviceType, ProtocolVersion
+from midealocal.const import MAX_BYTE_VALUE, DeviceType
 from midealocal.crc8 import calculate
 from midealocal.message import (
     BodyType,
@@ -106,7 +106,7 @@ class MessageACBase(MessageRequest):
 
     def __init__(
         self,
-        protocol_version: ProtocolVersion,
+        protocol_version: int,
         message_type: MessageType,
         body_type: BodyType,
     ) -> None:
@@ -137,7 +137,7 @@ def body(self) -> bytearray:
 class MessageQuery(MessageACBase):
     """AC message query."""
 
-    def __init__(self, protocol_version: ProtocolVersion) -> None:
+    def __init__(self, protocol_version: int) -> None:
         """Initialize AC message query."""
         super().__init__(
             protocol_version=protocol_version,
@@ -177,7 +177,7 @@ class MessageCapabilitiesQuery(MessageACBase):
 
     def __init__(
         self,
-        protocol_version: ProtocolVersion,
+        protocol_version: int,
         additional_capabilities: bool,
     ) -> None:
         """Initialize AC message capabilities query."""
@@ -198,7 +198,7 @@ def _body(self) -> bytearray:
 class MessagePowerQuery(MessageACBase):
     """AC message power query."""
 
-    def __init__(self, protocol_version: ProtocolVersion) -> None:
+    def __init__(self, protocol_version: int) -> None:
         """Initialize AC message power query."""
         super().__init__(
             protocol_version=protocol_version,
@@ -221,7 +221,7 @@ def body(self) -> bytearray:
 class MessageToggleDisplay(MessageACBase):
     """AC message toggle display."""
 
-    def __init__(self, protocol_version: ProtocolVersion) -> None:
+    def __init__(self, protocol_version: int) -> None:
         """Initialize AC message toggle display."""
         super().__init__(
             protocol_version=protocol_version,
@@ -261,7 +261,7 @@ def _body(self) -> bytearray:
 class MessageNewProtocolQuery(MessageACBase):
     """AC message new protocol query."""
 
-    def __init__(self, protocol_version: ProtocolVersion) -> None:
+    def __init__(self, protocol_version: int) -> None:
         """Initialize AC message new protocol query."""
         super().__init__(
             protocol_version=protocol_version,
@@ -291,7 +291,7 @@ class MessageSubProtocol(MessageACBase):
 
     def __init__(
         self,
-        protocol_version: ProtocolVersion,
+        protocol_version: int,
         message_type: MessageType,
         subprotocol_query_type: int,
     ) -> None:
@@ -339,7 +339,7 @@ class MessageSubProtocolQuery(MessageSubProtocol):
 
     def __init__(
         self,
-        protocol_version: ProtocolVersion,
+        protocol_version: int,
         subprotocol_query_type: int,
     ) -> None:
         """Initialize AC message sub protocol query."""
@@ -353,7 +353,7 @@ def __init__(
 class MessageSubProtocolSet(MessageSubProtocol):
     """AC message sub protocol set."""
 
-    def __init__(self, protocol_version: ProtocolVersion) -> None:
+    def __init__(self, protocol_version: int) -> None:
         """Initialize AC message sub protocol set."""
         super().__init__(
             protocol_version=protocol_version,
@@ -437,7 +437,7 @@ def _subprotocol_body(self) -> bytes:
 class MessageGeneralSet(MessageACBase):
     """AC message general set."""
 
-    def __init__(self, protocol_version: ProtocolVersion) -> None:
+    def __init__(self, protocol_version: int) -> None:
         """Initialize AC message general set."""
         super().__init__(
             protocol_version=protocol_version,
@@ -529,7 +529,7 @@ def _body(self) -> bytearray:
 class MessageNewProtocolSet(MessageACBase):
     """AC message new protocol set."""
 
-    def __init__(self, protocol_version: ProtocolVersion) -> None:
+    def __init__(self, protocol_version: int) -> None:
         """Initialize AC message new protocol set."""
         super().__init__(
             protocol_version=protocol_version,

diff --git a/midealocal/devices/b0/message.py b/midealocal/devices/b0/message.py
@@ -17,7 +17,7 @@ class MessageB0Base(MessageRequest):
 
     def __init__(
         self,
-        protocol_version: ProtocolVersion,
+        protocol_version: int,
         message_type: MessageType,
         body_type: BodyType,
     ) -> None:
@@ -53,7 +53,7 @@ def _body(self) -> bytearray:
 class MessageQuery01(MessageB0Base):
     """B0 message query 01."""
 
-    def __init__(self, protocol_version: ProtocolVersion) -> None:
+    def __init__(self, protocol_version: int) -> None:
         """Initialize B0 message query 01."""
         super().__init__(
             protocol_version=protocol_version,

diff --git a/midealocal/devices/b1/message.py b/midealocal/devices/b1/message.py
@@ -1,6 +1,6 @@
 """Midea local B1 message."""
 
-from midealocal.const import MAX_BYTE_VALUE, DeviceType, ProtocolVersion
+from midealocal.const import MAX_BYTE_VALUE, DeviceType
 from midealocal.message import (
     BodyType,
     MessageBody,
@@ -15,7 +15,7 @@ class MessageB1Base(MessageRequest):
 
     def __init__(
         self,
-        protocol_version: ProtocolVersion,
+        protocol_version: int,
         message_type: MessageType,
         body_type: BodyType,
     ) -> None:
@@ -35,7 +35,7 @@ def _body(self) -> bytearray:
 class MessageQuery(MessageB1Base):
     """B1 message query."""
 
-    def __init__(self, protocol_version: ProtocolVersion) -> None:
+    def __init__(self, protocol_version: int) -> None:
         """Initialize B1 message query."""
         super().__init__(
             protocol_version=protocol_version,

diff --git a/midealocal/devices/b3/message.py b/midealocal/devices/b3/message.py
@@ -1,6 +1,6 @@
 """Midea local B3 message."""
 
-from midealocal.const import MAX_BYTE_VALUE, DeviceType, ProtocolVersion
+from midealocal.const import MAX_BYTE_VALUE, DeviceType
 from midealocal.message import (
     BodyType,
     MessageBody,
@@ -22,7 +22,7 @@ class MessageB3Base(MessageRequest):
 
     def __init__(
         self,
-        protocol_version: ProtocolVersion,
+        protocol_version: int,
         message_type: MessageType,
         body_type: BodyType,
     ) -> None:
@@ -42,7 +42,7 @@ def _body(self) -> bytearray:
 class MessageQuery(MessageB3Base):
     """B3 message query."""
 
-    def __init__(self, protocol_version: ProtocolVersion) -> None:
+    def __init__(self, protocol_version: int) -> None:
         """Initialize B3 message query."""
         super().__init__(
             protocol_version=protocol_version,

diff --git a/midealocal/devices/b4/message.py b/midealocal/devices/b4/message.py
@@ -1,6 +1,6 @@
 """Midea local B4 message."""
 
-from midealocal.const import MAX_BYTE_VALUE, DeviceType, ProtocolVersion
+from midealocal.const import MAX_BYTE_VALUE, DeviceType
 from midealocal.message import (
     BodyType,
     MessageBody,
@@ -15,7 +15,7 @@ class MessageB4Base(MessageRequest):
 
     def __init__(
         self,
-        protocol_version: ProtocolVersion,
+        protocol_version: int,
         message_type: MessageType,
         body_type: BodyType,
     ) -> None:
@@ -35,7 +35,7 @@ def _body(self) -> bytearray:
 class MessageQuery(MessageB4Base):
     """B4 message query."""
 
-    def __init__(self, protocol_version: ProtocolVersion) -> None:
+    def __init__(self, protocol_version: int) -> None:
         """Initialize B4 message query."""
         super().__init__(
             protocol_version=protocol_version,

diff --git a/midealocal/devices/b6/message.py b/midealocal/devices/b6/message.py
@@ -21,7 +21,7 @@ class MessageB6Base(MessageRequest):
 
     def __init__(
         self,
-        protocol_version: ProtocolVersion,
+        protocol_version: int,
         message_type: MessageType,
         body_type: BodyType,
     ) -> None:
@@ -41,14 +41,12 @@ def _body(self) -> bytearray:
 class MessageQuery(MessageB6Base):
     """B6 message query."""
 
-    def __init__(self, protocol_version: ProtocolVersion) -> None:
+    def __init__(self, protocol_version: int) -> None:
         """Initialize B6 message query."""
         super().__init__(
             protocol_version=protocol_version,
             message_type=MessageType.query,
-            body_type=BodyType.X11
-            if protocol_version == ProtocolVersion.V2
-            else BodyType.X31,
+            body_type=BodyType.X11 if protocol_version == 2 else BodyType.X31,
         )
 
     @property
@@ -75,7 +73,7 @@ def _body(self) -> bytearray:
 class MessageSet(MessageB6Base):
     """B6 message set."""
 
-    def __init__(self, protocol_version: ProtocolVersion) -> None:
+    def __init__(self, protocol_version: int) -> None:
         """Initialize B6 message set."""
         super().__init__(
             protocol_version=protocol_version,

diff --git a/midealocal/devices/b8/message.py b/midealocal/devices/b8/message.py
@@ -1,6 +1,6 @@
 """Midea local B8 message."""
 
-from midealocal.const import DeviceType, ProtocolVersion
+from midealocal.const import DeviceType
 from midealocal.message import (
     BodyType,
     BoolParser,
@@ -37,7 +37,7 @@ class MessageB8Base(MessageRequest):
 
     def __init__(
         self,
-        protocol_version: ProtocolVersion,
+        protocol_version: int,
         message_type: MessageType,
         body_type: BodyType,
     ) -> None:
@@ -57,7 +57,7 @@ def _body(self) -> bytearray:
 class MessageQuery(MessageB8Base):
     """B8 message query."""
 
-    def __init__(self, protocol_version: ProtocolVersion) -> None:
+    def __init__(self, protocol_version: int) -> None:
         """Initialize B8 message query."""
         super().__init__(
             protocol_version=protocol_version,
@@ -73,7 +73,7 @@ def _body(self) -> bytearray:
 class MessageSet(MessageB8Base):
     """B8 message set."""
 
-    def __init__(self, protocol_version: ProtocolVersion) -> None:
+    def __init__(self, protocol_version: int) -> None:
         """Initialize B8 message set."""
         super().__init__(
             protocol_version=protocol_version,
@@ -107,7 +107,7 @@ class MessageSetCommand(MessageB8Base):
 
     def __init__(
         self,
-        protocol_version: ProtocolVersion,
+        protocol_version: int,
         work_mode: B8WorkMode,
     ) -> None:
         """Initialize B8 message set command."""

diff --git a/midealocal/devices/bf/message.py b/midealocal/devices/bf/message.py
@@ -15,7 +15,7 @@ class MessageBFBase(MessageRequest):
 
     def __init__(
         self,
-        protocol_version: ProtocolVersion,
+        protocol_version: int,
         message_type: MessageType,
         body_type: BodyType,
     ) -> None:
@@ -35,7 +35,7 @@ def _body(self) -> bytearray:
 class MessageQuery(MessageBFBase):
     """BF message query."""
 
-    def __init__(self, protocol_version: ProtocolVersion) -> None:
+    def __init__(self, protocol_version: int) -> None:
         """Initialize BF message query."""
         super().__init__(
             protocol_version=protocol_version,

diff --git a/midealocal/devices/c2/message.py b/midealocal/devices/c2/message.py
@@ -54,7 +54,7 @@ class MessageC2Base(MessageRequest):
 
     def __init__(
         self,
-        protocol_version: ProtocolVersion,
+        protocol_version: int,
         message_type: MessageType,
         body_type: BodyType,
     ) -> None:
@@ -74,7 +74,7 @@ def _body(self) -> bytearray:
 class MessageQuery(MessageC2Base):
     """C2 message query."""
 
-    def __init__(self, protocol_version: ProtocolVersion) -> None:
+    def __init__(self, protocol_version: int) -> None:
         """Initialize C2 message query."""
         super().__init__(
             protocol_version=protocol_version,
@@ -90,7 +90,7 @@ def _body(self) -> bytearray:
 class MessagePower(MessageC2Base):
     """C2 message power."""
 
-    def __init__(self, protocol_version: ProtocolVersion) -> None:
+    def __init__(self, protocol_version: int) -> None:
         """Initialize C2 message power."""
         super().__init__(
             protocol_version=protocol_version,
@@ -127,7 +127,7 @@ def _body(self) -> bytearray:
 class MessageSet(MessageC2Base):
     """C2 message set."""
 
-    def __init__(self, protocol_version: ProtocolVersion) -> None:
+    def __init__(self, protocol_version: int) -> None:
         """Initialize C2 message set."""
         super().__init__(
             protocol_version=protocol_version,