casambi-bt-revamped 0.3.6.dev13__tar.gz → 0.3.6.dev15__tar.gz

{casambi_bt_revamped-0.3.6.dev13/src/casambi_bt_revamped.egg-info → casambi_bt_revamped-0.3.6.dev15}/PKG-INFO

@@ -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 → casambi_bt_revamped-0.3.6.dev15}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = casambi-bt-revamped
-version = 0.3.6.dev13
+version = 0.3.6.dev15
 author = rankjie
 author_email = rankjie@gmail.com
 description = Enhanced Casambi Bluetooth client library with switch event support

{casambi_bt_revamped-0.3.6.dev13 → casambi_bt_revamped-0.3.6.dev15}/src/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 → casambi_bt_revamped-0.3.6.dev15/src/casambi_bt_revamped.egg-info}/PKG-INFO

@@ -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