casambi-bt-revamped 0.3.6.dev19__py3-none-any.whl → 0.3.7.dev2__py3-none-any.whl

CasambiBt/_client.py

@@ -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:
@@ -689,10 +695,10 @@ class CasambiClient:
         # This is redundant since we already return early if unit_id_echo != unit_id
         # Removing to avoid confusion
         
-        # Filter out type 0x08 messages with button=0 (likely notifications)
-        if message_type == 0x08 and button == 0:
+        # Filter out ALL type 0x08 messages (broadcast notifications with incorrect button numbers)
+        if message_type == 0x08:
             self._logger.debug(
-                f"Filtering out type 0x08 notification event: button={button}, unit_id={unit_id}, "
+                f"Filtering out type 0x08 broadcast event: button={button} (incorrect), unit_id={unit_id}, "
                 f"action={action_display}, flags=0x{flags:02x}"
             )
             return

{casambi_bt_revamped-0.3.6.dev19.dist-info → casambi_bt_revamped-0.3.7.dev2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: casambi-bt-revamped
-Version: 0.3.6.dev19
+Version: 0.3.7.dev2
 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.dev19.dist-info → casambi_bt_revamped-0.3.7.dev2.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=eF55R8v0_mni_1qsyUw3UrF-PZc3CZP7MQ91-5AuXbo,30218
+CasambiBt/_client.py,sha256=9unl06kieav7Xnn7x8nljiwmv2U8_Wdp3GwxuJdT76o,30589
 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.dev19.dist-info/licenses/LICENSE,sha256=TAIIitFxpxEDi6Iju7foW4TDQmWvC-IhLVLhl67jKmQ,11341
-casambi_bt_revamped-0.3.6.dev19.dist-info/METADATA,sha256=dRlINY8K_YjmQUad7jillSDC1P6CqE8T6R9_GSYgW5I,3050
-casambi_bt_revamped-0.3.6.dev19.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-casambi_bt_revamped-0.3.6.dev19.dist-info/top_level.txt,sha256=uNbqLjtecFosoFzpGAC89-5icikWODKI8rOjbi8v_sA,10
-casambi_bt_revamped-0.3.6.dev19.dist-info/RECORD,,
+casambi_bt_revamped-0.3.7.dev2.dist-info/licenses/LICENSE,sha256=TAIIitFxpxEDi6Iju7foW4TDQmWvC-IhLVLhl67jKmQ,11341
+casambi_bt_revamped-0.3.7.dev2.dist-info/METADATA,sha256=-cu558LFlTi9ux6C8YNPFBBIZKdS2nRhfEd19VH_D5U,3049
+casambi_bt_revamped-0.3.7.dev2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+casambi_bt_revamped-0.3.7.dev2.dist-info/top_level.txt,sha256=uNbqLjtecFosoFzpGAC89-5icikWODKI8rOjbi8v_sA,10
+casambi_bt_revamped-0.3.7.dev2.dist-info/RECORD,,