casambi-bt-revamped 0.3.6.dev7__py3-none-any.whl → 0.3.6.dev9__py3-none-any.whl

CasambiBt/_client.py

@@ -505,7 +505,7 @@ class CasambiClient:
 
     def _parseSwitchEvent(self, data: bytes, packet_seq: int = None, raw_packet: bytes = None, android_switch_event: dict = None) -> None:
         """Parse switch event packet which contains multiple message types"""
-        self._logger.info(f"Parsing incoming switch event packet... Data: {b2a(data)}")
+        self._logger.info(f"Parsing incoming switch event packet #{packet_seq}... Data: {b2a(data)}")
         
         # Special handling for message type 0x29 - not a switch event
         if len(data) >= 1 and data[0] == 0x29:
@@ -585,27 +585,21 @@ class CasambiClient:
             self._logger.error("Switch message has empty payload")
             return
 
-        unit_id = payload[0]
-
-        action = None
-        if len(payload) > 1:
+        # For type 0x10 messages, the structure might be different
+        if message_type == 0x10 and len(payload) >= 3 and payload[2] == 0x1f:
+            # Special case: unit_id might be in payload[2] for some type 0x10 messages
+            unit_id = payload[2]
             action = payload[1]
-
-        extra_data = b''
-        if len(payload) > 2:
-            extra_data = payload[2:]
-            
-            # Validate extra data for type 0x10
-            if message_type == 0x10 and len(extra_data) >= 3:
-                # Expected pattern: [unit_id_echo][0x12 or similar][0x00]
-                unit_id_echo = extra_data[0]
-                if unit_id_echo != unit_id:
-                    # If unit_id_echo doesn't match, this might be an internal protocol message
-                    # Log it for debugging but don't process as a regular switch event
-                    self._logger.debug(
-                        f"Ignoring internal protocol message: unit_id={unit_id}, unit_id_echo={unit_id_echo}"
-                    )
-                    return  # Don't process this as a switch event
+            extra_data = payload[3:] if len(payload) > 3 else b''
+        else:
+            # Standard parsing
+            unit_id = payload[0]
+            action = None
+            if len(payload) > 1:
+                action = payload[1]
+            extra_data = b''
+            if len(payload) > 2:
+                extra_data = payload[2:]
 
         event_string = "unknown"
         
@@ -632,7 +626,18 @@ class CasambiClient:
                 else:
                     self._logger.warning(f"Unknown state byte: 0x{state_byte:02x}")
             else:
-                self._logger.warning("Type 0x10 message missing state byte information")
+                # For some units, type 0x10 messages don't have the state byte
+                # In these cases, check if we have extra_data that might contain state info
+                if len(extra_data) >= 2:
+                    # Pattern observed: extra_data[0] might contain state info
+                    # 0x12 seems to correlate with button release states
+                    if extra_data[0] == 0x12:
+                        event_string = "button_release"
+                    else:
+                        event_string = "button_press"
+                    self._logger.debug(f"Type 0x10: Using extra_data for state detection: {b2a(extra_data)}")
+                else:
+                    self._logger.warning(f"Type 0x10 message missing state info, payload: {b2a(payload)}")
 
         action_display = f"{action:#04x}" if action is not None else "N/A"
 
@@ -660,10 +665,8 @@ class CasambiClient:
                 
         # Extract controlling unit if present
         controlling_unit = None
-        if message_type == 0x10 and len(extra_data) >= 1:
-            unit_id_echo = extra_data[0]
-            if unit_id_echo != unit_id:
-                controlling_unit = unit_id_echo
+        # This is redundant since we already return early if unit_id_echo != unit_id
+        # Removing to avoid confusion
 
         self._dataCallback(
             IncommingPacketType.SwitchEvent,

{casambi_bt_revamped-0.3.6.dev7.dist-info → casambi_bt_revamped-0.3.6.dev9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: casambi-bt-revamped
-Version: 0.3.6.dev7
+Version: 0.3.6.dev9
 Summary: Enhanced Casambi Bluetooth client library with switch event support
 Home-page: https://github.com/rankjie/casambi-bt
 Author: rankjie

{casambi_bt_revamped-0.3.6.dev7.dist-info → casambi_bt_revamped-0.3.6.dev9.dist-info}/RECORD

@@ -1,7 +1,7 @@
 CasambiBt/__init__.py,sha256=TW445xSu5PV3TyMjJfwaA1JoWvQQ8LXhZgGdDTfWf3s,302
 CasambiBt/_cache.py,sha256=KZ2xbiHAHXUPa8Gw_75Nw9NL4QSY_sTWHbyYXYUDaB0,3865
 CasambiBt/_casambi.py,sha256=gLLkhEcObgapqTx5Mk7WRClyG29UyfZYZCCIhhOg4H4,23101
-CasambiBt/_client.py,sha256=1YO2nXbKFY2Fj-ePvQ-GObNA-D15vj96PAUne59iFVs,28298
+CasambiBt/_client.py,sha256=NvOSoWeuh6FN0jKJvIaesE6e9MLGj8-DTndRU-XEj9I,28670
 CasambiBt/_client_android_parser.py,sha256=1lVkVYMO0Nhh9_nkNwgb68hlCS_uD8WxYQDir5hOdHs,7744
 CasambiBt/_constants.py,sha256=_AxkG7Btxl4VeS6mO7GJW5Kc9dFs3s9sDmtJ83ZEKNw,359
 CasambiBt/_discover.py,sha256=H7HpiFYIy9ELvmPXXd_ck-5O5invJf15dDIRk-vO5IE,1696
@@ -12,8 +12,8 @@ CasambiBt/_operation.py,sha256=-BuC1Bvtg-G-zSN_b_0JMvXdHZaR6LbTw0S425jg96c,842
 CasambiBt/_unit.py,sha256=YiQWoHmMDWHHo4XAjtW8rHsBqIqpmp9MVdv1Mbu2xw4,17043
 CasambiBt/errors.py,sha256=0JgDjaKlAKDes0poWzA8nrTUYQ8qdNfBb8dfaqqzCRA,1664
 CasambiBt/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-casambi_bt_revamped-0.3.6.dev7.dist-info/licenses/LICENSE,sha256=TAIIitFxpxEDi6Iju7foW4TDQmWvC-IhLVLhl67jKmQ,11341
-casambi_bt_revamped-0.3.6.dev7.dist-info/METADATA,sha256=B00ynXU5EItL1_0bbG9Dwmde6F3d96bFTWF4rMc73Gc,3049
-casambi_bt_revamped-0.3.6.dev7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-casambi_bt_revamped-0.3.6.dev7.dist-info/top_level.txt,sha256=uNbqLjtecFosoFzpGAC89-5icikWODKI8rOjbi8v_sA,10
-casambi_bt_revamped-0.3.6.dev7.dist-info/RECORD,,
+casambi_bt_revamped-0.3.6.dev9.dist-info/licenses/LICENSE,sha256=TAIIitFxpxEDi6Iju7foW4TDQmWvC-IhLVLhl67jKmQ,11341
+casambi_bt_revamped-0.3.6.dev9.dist-info/METADATA,sha256=rZUP2olCMHGkfWt-lnjJDSWZ2DU0c4sMB8LbPHrpitY,3049
+casambi_bt_revamped-0.3.6.dev9.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+casambi_bt_revamped-0.3.6.dev9.dist-info/top_level.txt,sha256=uNbqLjtecFosoFzpGAC89-5icikWODKI8rOjbi8v_sA,10
+casambi_bt_revamped-0.3.6.dev9.dist-info/RECORD,,