casambi-bt-revamped 0.3.6.dev13__py3-none-any.whl → 0.3.6.dev15__py3-none-any.whl

CasambiBt/_client.py

@@ -551,8 +551,14 @@ class CasambiClient:
                 # Process based on message type
                 if message_type == 0x08 or message_type == 0x10:  # Switch/button events
                     switch_events_found += 1
-                    # Extract button ID from parameter field (consistent for all message types)
-                    button = parameter
+                    # Extract button ID using Android-inspired approach
+                    # Android principle: button should be consistent for same physical button
+                    if len(payload) > 4:
+                        # Use payload[4] which is consistent across message types (0 for both)
+                        button = payload[4]
+                    else:
+                        # Fallback to parameter for short payloads
+                        button = parameter
                     
                     # For type 0x10 messages, we need to pass additional data beyond the declared payload
                     if message_type == 0x10:
@@ -595,21 +601,30 @@ class CasambiClient:
             self._logger.error("Switch message has empty payload")
             return
 
-        # For type 0x10 messages, the structure is different
+        # Extract unit_id based on message type
         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 for other message types
             unit_id = payload[0]
-            action = None
-            if len(payload) > 1:
-                action = payload[1]
             extra_data = b''
             if len(payload) > 2:
                 extra_data = payload[2:]
+        
+        # Extract action using Android-inspired approach for consistency
+        if len(payload) > 4:
+            # Use payload[4] which is consistent across message types (0 for both)
+            action = payload[4]
+        else:
+            # Fallback to traditional extraction for short payloads
+            if message_type == 0x10 and len(payload) > 1:
+                action = payload[1]
+            elif len(payload) > 1:
+                action = payload[1]
+            else:
+                action = None
 
         event_string = "unknown"
         

{casambi_bt_revamped-0.3.6.dev13.dist-info → casambi_bt_revamped-0.3.6.dev15.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: casambi-bt-revamped
-Version: 0.3.6.dev13
+Version: 0.3.6.dev15
 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.dev13.dist-info → casambi_bt_revamped-0.3.6.dev15.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=JvufY9Pr26tN3OSH7tnuANx5lK3b1XrvqkalcHSuCfw,29310
+CasambiBt/_client.py,sha256=qzlGobl2ktwkQTeZUOM0Wx8-DGq5YU74p7vPbWN3Nik,30038
 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.dev13.dist-info/licenses/LICENSE,sha256=TAIIitFxpxEDi6Iju7foW4TDQmWvC-IhLVLhl67jKmQ,11341
-casambi_bt_revamped-0.3.6.dev13.dist-info/METADATA,sha256=CiAMqS3VojyMxBx-wGHULFxKoMc6_cgfODJ3vosZXdM,3050
-casambi_bt_revamped-0.3.6.dev13.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-casambi_bt_revamped-0.3.6.dev13.dist-info/top_level.txt,sha256=uNbqLjtecFosoFzpGAC89-5icikWODKI8rOjbi8v_sA,10
-casambi_bt_revamped-0.3.6.dev13.dist-info/RECORD,,
+casambi_bt_revamped-0.3.6.dev15.dist-info/licenses/LICENSE,sha256=TAIIitFxpxEDi6Iju7foW4TDQmWvC-IhLVLhl67jKmQ,11341
+casambi_bt_revamped-0.3.6.dev15.dist-info/METADATA,sha256=N5XlFjqP2Du298VQqPFBagFKzhatuz1loohA0dYLHQg,3050
+casambi_bt_revamped-0.3.6.dev15.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+casambi_bt_revamped-0.3.6.dev15.dist-info/top_level.txt,sha256=uNbqLjtecFosoFzpGAC89-5icikWODKI8rOjbi8v_sA,10
+casambi_bt_revamped-0.3.6.dev15.dist-info/RECORD,,