casambi-bt-revamped 0.3.7.dev12__tar.gz → 0.3.7.dev14__tar.gz

{casambi_bt_revamped-0.3.7.dev12/src/casambi_bt_revamped.egg-info → casambi_bt_revamped-0.3.7.dev14}/PKG-INFO

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

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

{casambi_bt_revamped-0.3.7.dev12 → casambi_bt_revamped-0.3.7.dev14}/src/CasambiBt/_casambi.py

@@ -683,6 +683,19 @@ class Casambi:
         import json
         data = json.dumps(switch_config, separators=(",", ":")).encode("utf-8")
 
+        # Attempt to start a switch session before sending chunks. Some devices
+        # expect an AcquireSwitchSession (opcode 42) handshake prior to ExtPacketSend.
+        try:
+            await self.start_switch_session(unit_id)
+            self._logger.info("Started switch session (AcquireSwitchSession) for unit %s", unit_id)
+        except Exception as e:
+            # Non-fatal: proceed without session if device doesn't require it.
+            self._logger.info(
+                "AcquireSwitchSession not acknowledged or unsupported for unit %s (%s); proceeding with ExtPacketSend only.",
+                unit_id,
+                e,
+            )
+
         # Chunk into 61-byte pieces (ExtPacket payload allows 63 total minus 2-byte header)
         max_chunk = 61
         seq = 0

{casambi_bt_revamped-0.3.7.dev12 → casambi_bt_revamped-0.3.7.dev14}/src/CasambiBt/_client.py

@@ -418,6 +418,13 @@ class CasambiClient:
         # Store raw encrypted packet for reference
         raw_encrypted_packet = data[:]
 
+        # Extract the device-provided 4-byte little-endian counter from the
+        # encrypted header. This is the true per-session packet sequence.
+        try:
+            device_sequence = int.from_bytes(data[:4], byteorder="little", signed=False)
+        except Exception:
+            device_sequence = None
+
         try:
             decrypted_data = self._encryptor.decryptAndVerify(
                 data, data[:4] + self._nonce[4:]
@@ -433,8 +440,11 @@ class CasambiClient:
         if packetType == IncommingPacketType.UnitState:
             self._parseUnitStates(decrypted_data[1:])
         elif packetType == IncommingPacketType.SwitchEvent:
+            # Pass the device sequence as the packet sequence for consumers,
+            # and still include the raw encrypted packet for diagnostics.
+            seq_for_consumer = device_sequence if device_sequence is not None else self._inPacketCount
             self._parseSwitchEvent(
-                decrypted_data[1:], self._inPacketCount, raw_encrypted_packet
+                decrypted_data[1:], seq_for_consumer, raw_encrypted_packet
             )
         elif packetType == IncommingPacketType.NetworkConfig:
             # We don't care about the config the network thinks it has.
@@ -552,21 +562,32 @@ 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 - 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
+                    
+                    # Button extraction differs between type 0x08 and type 0x10
+                    if message_type == 0x08:
+                        # For type 0x08, the lower nibble is a code that maps to physical button id
+                        # Using formula: ((code + 2) % 4) + 1 based on reverse engineering findings
+                        code_nibble = parameter & 0x0F
+                        button = ((code_nibble + 2) % 4) + 1
                         self._logger.debug(
-                            f"EVO button extraction: parameter=0x{parameter:02x}, using upper nibble, button={button}"
+                            f"Type 0x08 button extraction: parameter=0x{parameter:02x}, code={code_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, use existing logic
+                        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"Type 0x10 button extraction: parameter=0x{parameter:02x}, using upper nibble, button={button}"
+                            )
+                        else:
+                            button = button_lower
+                            self._logger.debug(
+                                f"Type 0x10 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:
@@ -705,13 +726,12 @@ class CasambiClient:
             f"action={action_display} ({event_string}), flags=0x{flags:02x}"
         )
 
-        # Filter out all type 0x08 messages
+        # Log detailed info about type 0x08 messages (now processed, not filtered)
         if message_type == 0x08:
-            self._logger.debug(
-                f"Filtering out type 0x08 event: button={button}, unit_id={unit_id}, "
-                f"action={action_display}, flags=0x{flags:02x}"
+            self._logger.info(
+                f"Type 0x08 event processed: button={button}, unit_id={unit_id}, "
+                f"action={action_display}, event={event_string}, flags=0x{flags:02x}"
             )
-            return
 
         self._dataCallback(
             IncommingPacketType.SwitchEvent,
@@ -723,7 +743,11 @@ class CasambiClient:
                 "event": event_string,
                 "flags": flags,
                 "extra_data": extra_data,
+                # packet_sequence is the device-provided sequence number when available
+                # (true 32-bit counter from the BLE header), otherwise the local arrival index.
                 "packet_sequence": packet_seq,
+                # Include the local arrival index for debugging and correlation.
+                "arrival_sequence": self._inPacketCount,
                 "raw_packet": b2a(raw_packet) if raw_packet else None,
                 "decrypted_data": b2a(full_data),
                 "message_position": start_pos,

{casambi_bt_revamped-0.3.7.dev12 → casambi_bt_revamped-0.3.7.dev14/src/casambi_bt_revamped.egg-info}/PKG-INFO

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