casambi-bt-revamped 0.3.6.dev5__py3-none-any.whl → 0.3.6.dev7__py3-none-any.whl

CasambiBt/_client.py

@@ -600,16 +600,12 @@ class CasambiClient:
                 # Expected pattern: [unit_id_echo][0x12 or similar][0x00]
                 unit_id_echo = extra_data[0]
                 if unit_id_echo != unit_id:
-                    # Special case: 0x1f (31) appears to be a broadcast/group indicator
-                    if unit_id_echo == 0x1f:
-                        self._logger.debug(
-                            f"Ignoring broadcast/group event from unit {unit_id} (unit_id_echo=0x1f)"
-                        )
-                        return  # Don't process this as a switch event
-                    else:
-                        self._logger.warning(
-                            f"Extra data validation failed: unit_id_echo {unit_id_echo} != unit_id {unit_id}"
-                        )
+                    # If unit_id_echo doesn't match, this might be an internal protocol message
+                    # Log it for debugging but don't process as a regular switch event
+                    self._logger.debug(
+                        f"Ignoring internal protocol message: unit_id={unit_id}, unit_id_echo={unit_id_echo}"
+                    )
+                    return  # Don't process this as a switch event
 
         event_string = "unknown"
         
@@ -661,6 +657,13 @@ class CasambiClient:
                 self._logger.warning(f"Unit ID mismatch: current={unit_id}, android={android_switch_event['unit_id']}")
             if android_switch_event['button'] != button:
                 self._logger.warning(f"Button mismatch: current={button}, android={android_switch_event['button']}")
+                
+        # Extract controlling unit if present
+        controlling_unit = None
+        if message_type == 0x10 and len(extra_data) >= 1:
+            unit_id_echo = extra_data[0]
+            if unit_id_echo != unit_id:
+                controlling_unit = unit_id_echo
 
         self._dataCallback(
             IncommingPacketType.SwitchEvent,
@@ -672,6 +675,7 @@ class CasambiClient:
                 "event": event_string,
                 "flags": flags,
                 "extra_data": extra_data,
+                "controlling_unit": controlling_unit,
                 "packet_sequence": packet_seq,
                 "raw_packet": b2a(raw_packet) if raw_packet else None,
                 "decrypted_data": b2a(full_data),

{casambi_bt_revamped-0.3.6.dev5.dist-info → casambi_bt_revamped-0.3.6.dev7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: casambi-bt-revamped
-Version: 0.3.6.dev5
+Version: 0.3.6.dev7
 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.dev5.dist-info → casambi_bt_revamped-0.3.6.dev7.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=KqmwUKUiH2NVSIpLVEL_61eCfmgLLjvd3a2pS73onQU,28124
+CasambiBt/_client.py,sha256=1YO2nXbKFY2Fj-ePvQ-GObNA-D15vj96PAUne59iFVs,28298
 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.dev5.dist-info/licenses/LICENSE,sha256=TAIIitFxpxEDi6Iju7foW4TDQmWvC-IhLVLhl67jKmQ,11341
-casambi_bt_revamped-0.3.6.dev5.dist-info/METADATA,sha256=39lfO89rhByMMsDjA2NRLtotWWkRLwxPpfPQJrvhYik,3049
-casambi_bt_revamped-0.3.6.dev5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-casambi_bt_revamped-0.3.6.dev5.dist-info/top_level.txt,sha256=uNbqLjtecFosoFzpGAC89-5icikWODKI8rOjbi8v_sA,10
-casambi_bt_revamped-0.3.6.dev5.dist-info/RECORD,,
+casambi_bt_revamped-0.3.6.dev7.dist-info/licenses/LICENSE,sha256=TAIIitFxpxEDi6Iju7foW4TDQmWvC-IhLVLhl67jKmQ,11341
+casambi_bt_revamped-0.3.6.dev7.dist-info/METADATA,sha256=B00ynXU5EItL1_0bbG9Dwmde6F3d96bFTWF4rMc73Gc,3049
+casambi_bt_revamped-0.3.6.dev7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+casambi_bt_revamped-0.3.6.dev7.dist-info/top_level.txt,sha256=uNbqLjtecFosoFzpGAC89-5icikWODKI8rOjbi8v_sA,10
+casambi_bt_revamped-0.3.6.dev7.dist-info/RECORD,,