casambi-bt-revamped 0.3.6.dev18__tar.gz → 0.3.7.dev1__tar.gz

{casambi_bt_revamped-0.3.6.dev18/src/casambi_bt_revamped.egg-info → casambi_bt_revamped-0.3.7.dev1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: casambi-bt-revamped
-Version: 0.3.6.dev18
+Version: 0.3.7.dev1
 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.dev18 → casambi_bt_revamped-0.3.7.dev1}/setup.cfg

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

{casambi_bt_revamped-0.3.6.dev18 → casambi_bt_revamped-0.3.7.dev1}/src/CasambiBt/_client.py

@@ -524,7 +524,7 @@ class CasambiClient:
                 message_type = data[pos]
                 flags = data[pos + 1]
                 length = ((data[pos + 2] >> 4) & 15) + 1
-                parameter = data[pos + 2] & 15
+                parameter = data[pos + 2]  # Full byte, not just lower 4 bits
                 pos += 3
 
                 # Sanity check: message type should be reasonable
@@ -551,11 +551,17 @@ 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 - parameter field contains the button ID
-                    # For EVO firmware: parameter encodes button ID in lower 4 bits
-                    # (0x40=button0, 0x41=button1, 0x42=button2, etc.)
-                    button = parameter & 0x0F
-                    self._logger.debug(f"EVO button extraction: parameter=0x{parameter:02x}, button={button}")
+                    # Extract button ID - try both upper and lower nibbles
+                    button_lower = parameter & 0x0F
+                    button_upper = (parameter >> 4) & 0x0F
+                    
+                    # Use upper 4 bits if lower 4 bits are 0, otherwise use lower 4 bits
+                    if button_lower == 0 and button_upper != 0:
+                        button = button_upper
+                        self._logger.debug(f"EVO button extraction: parameter=0x{parameter:02x}, using upper nibble, button={button}")
+                    else:
+                        button = button_lower
+                        self._logger.debug(f"EVO button extraction: parameter=0x{parameter:02x}, using lower nibble, button={button}")
                     
                     # For type 0x10 messages, we need to pass additional data beyond the declared payload
                     if message_type == 0x10:

{casambi_bt_revamped-0.3.6.dev18 → casambi_bt_revamped-0.3.7.dev1/src/casambi_bt_revamped.egg-info}/PKG-INFO

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