casambi-bt-revamped 0.3.6.dev10__py3-none-any.whl → 0.3.6.dev12__py3-none-any.whl

CasambiBt/_client.py

@@ -551,10 +551,22 @@ class CasambiClient:
                 # Process based on message type
                 if message_type == 0x08 or message_type == 0x10:  # Switch/button events
                     switch_events_found += 1
-                    # For type 0x10 messages, include the full data from start position to current position
-                    # This ensures we capture any additional bytes after the declared payload
-                    full_message_data = data[oldPos:pos] if message_type == 0x10 else data
-                    self._processSwitchMessage(message_type, flags, parameter, payload, full_message_data, oldPos, packet_seq, raw_packet, android_switch_event)
+                    # Extract button ID based on message type
+                    if message_type == 0x08:
+                        # Type 0x08: button is in upper nibble of flags byte
+                        button = (flags >> 4) & 15
+                    else:  # message_type == 0x10
+                        # Type 0x10: button is the parameter field
+                        button = parameter
+                    
+                    # 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, button, 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")
@@ -615,6 +627,7 @@ class CasambiClient:
         elif message_type == 0x10:
             # 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]
@@ -627,7 +640,7 @@ class CasambiClient:
                 elif state_byte == 0x0c:
                     event_string = "button_release_after_hold"
                 else:
-                    self._logger.debug(f"Type 0x10: State byte 0x{state_byte:02x} at pos {state_pos}")
+                    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"

{casambi_bt_revamped-0.3.6.dev10.dist-info → casambi_bt_revamped-0.3.6.dev12.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: casambi-bt-revamped
-Version: 0.3.6.dev10
+Version: 0.3.6.dev12
 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.dev10.dist-info → casambi_bt_revamped-0.3.6.dev12.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=BR-Lhv79ntkMTQuxC445BP9B_qaAQNdWE0vJ-fWbR0o,28892
+CasambiBt/_client.py,sha256=grR_bx4a_5iweG4ky9GrkER1OqGwkxCYFuNFcBtfU04,29570
 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.dev10.dist-info/licenses/LICENSE,sha256=TAIIitFxpxEDi6Iju7foW4TDQmWvC-IhLVLhl67jKmQ,11341
-casambi_bt_revamped-0.3.6.dev10.dist-info/METADATA,sha256=WcVq71w4pxbClRQx4jJ2k_z6CaMpMJxTf6nR1d9WUR8,3050
-casambi_bt_revamped-0.3.6.dev10.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-casambi_bt_revamped-0.3.6.dev10.dist-info/top_level.txt,sha256=uNbqLjtecFosoFzpGAC89-5icikWODKI8rOjbi8v_sA,10
-casambi_bt_revamped-0.3.6.dev10.dist-info/RECORD,,
+casambi_bt_revamped-0.3.6.dev12.dist-info/licenses/LICENSE,sha256=TAIIitFxpxEDi6Iju7foW4TDQmWvC-IhLVLhl67jKmQ,11341
+casambi_bt_revamped-0.3.6.dev12.dist-info/METADATA,sha256=3E1wBrrkhMFh0YptPZLkSWhgLoSubRvRfD4GzN9Pbm0,3050
+casambi_bt_revamped-0.3.6.dev12.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+casambi_bt_revamped-0.3.6.dev12.dist-info/top_level.txt,sha256=uNbqLjtecFosoFzpGAC89-5icikWODKI8rOjbi8v_sA,10
+casambi_bt_revamped-0.3.6.dev12.dist-info/RECORD,,