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

CasambiBt/_client.py

@@ -551,7 +551,14 @@ class CasambiClient:
                 # Process based on message type
                 if message_type == 0x08 or message_type == 0x10:  # Switch/button events
                     switch_events_found += 1
-                    self._processSwitchMessage(message_type, flags, parameter, payload, data, oldPos, packet_seq, raw_packet, android_switch_event)
+                    # For type 0x10 messages, we need to pass additional data beyond the declared payload
+                    if message_type == 0x10:
+                        # Extend to include at least 10 bytes from message start for state byte
+                        extended_end = min(oldPos + 11, len(data))
+                        full_message_data = data[oldPos:extended_end]
+                    else:
+                        full_message_data = data
+                    self._processSwitchMessage(message_type, flags, parameter, payload, full_message_data, oldPos, packet_seq, raw_packet, android_switch_event)
                 elif message_type == 0x29:
                     # This shouldn't happen due to check above, but just in case
                     self._logger.debug(f"Ignoring embedded type 0x29 message")
@@ -585,14 +592,14 @@ class CasambiClient:
             self._logger.error("Switch message has empty payload")
             return
 
-        # 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
+        # For type 0x10 messages, the structure is different
+        if message_type == 0x10 and len(payload) >= 3:
+            # Type 0x10: unit_id is at payload[2]
             unit_id = payload[2]
             action = payload[1]
             extra_data = payload[3:] if len(payload) > 3 else b''
         else:
-            # Standard parsing
+            # Standard parsing for other message types
             unit_id = payload[0]
             action = None
             if len(payload) > 1:
@@ -610,11 +617,12 @@ class CasambiClient:
                 is_release = (action >> 1) & 1
                 event_string = "button_release" if is_release else "button_press"
         elif message_type == 0x10:
-            # Type 0x10: Must check the additional state byte after the message
-            # The action value is a counter that increments with each state change
-            additional_data_pos = start_pos + 3 + len(payload)
-            if additional_data_pos + 2 < len(full_data):
-                state_byte = full_data[additional_data_pos + 1]
+            # Type 0x10: The state byte is at position 9 (0-indexed) from message start
+            # This applies to all units, not just unit 31
+            # full_data for type 0x10 is the message data starting from position 0
+            state_pos = 9
+            if len(full_data) > state_pos:
+                state_byte = full_data[state_pos]
                 if state_byte == 0x01:
                     event_string = "button_press"
                 elif state_byte == 0x02:
@@ -624,20 +632,21 @@ class CasambiClient:
                 elif state_byte == 0x0c:
                     event_string = "button_release_after_hold"
                 else:
-                    self._logger.warning(f"Unknown state byte: 0x{state_byte:02x}")
-            else:
-                # 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:
+                    self._logger.debug(f"Type 0x10: Unknown state byte 0x{state_byte:02x} at message pos {state_pos}")
+                    # Fallback: check if extra_data starts with 0x12 (indicates release)
+                    if len(extra_data) >= 1 and 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:
+                # Fallback when message is too short
+                if len(extra_data) >= 1 and extra_data[0] == 0x12:
+                    event_string = "button_release"
+                    self._logger.debug(f"Type 0x10: Using extra_data pattern for release detection")
                 else:
-                    self._logger.warning(f"Type 0x10 message missing state info, payload: {b2a(payload)}")
+                    # Cannot determine state
+                    self._logger.warning(f"Type 0x10 message missing state info, unit_id={unit_id}, payload={b2a(payload)}")
+                    event_string = "unknown"
 
         action_display = f"{action:#04x}" if action is not None else "N/A"
 

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: casambi-bt-revamped
-Version: 0.3.6.dev9
+Version: 0.3.6.dev11
 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.dev9.dist-info → casambi_bt_revamped-0.3.6.dev11.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=NvOSoWeuh6FN0jKJvIaesE6e9MLGj8-DTndRU-XEj9I,28670
+CasambiBt/_client.py,sha256=mC-U6CKr8prcm3C3t6g5trXjV5vf5nUaq4pK5YvQ6Ac,29157
 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.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,,
+casambi_bt_revamped-0.3.6.dev11.dist-info/licenses/LICENSE,sha256=TAIIitFxpxEDi6Iju7foW4TDQmWvC-IhLVLhl67jKmQ,11341
+casambi_bt_revamped-0.3.6.dev11.dist-info/METADATA,sha256=UOJXQeaYs4RsfJ_7FhCpwnnhLsHteuPa_GspiQccSv8,3050
+casambi_bt_revamped-0.3.6.dev11.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+casambi_bt_revamped-0.3.6.dev11.dist-info/top_level.txt,sha256=uNbqLjtecFosoFzpGAC89-5icikWODKI8rOjbi8v_sA,10
+casambi_bt_revamped-0.3.6.dev11.dist-info/RECORD,,