Skip to content

chore: merge latest (5.2.1–5.2.4) into beta-6.0.0 - #354

Merged
donavanbecker merged 6 commits into
beta-6.0.0from
chore/sync-latest-into-6
Oct 30, 2026
Merged

donavanbecker merged 6 commits into
beta-6.0.0from
chore/sync-latest-into-6

Conversation

@donavanbecker

Copy link
Copy Markdown
Contributor

Merges latest (5.2.1 to 5.2.4) into beta-6.0.0 before the 6.0.0 release, so 6.0.0 keeps dnicolson's BLE logging changes (#351, #352, #353).

There was one conflict: the disconnect fix landed on both branches (#349 to latest, #350 to beta-6.0.0). I kept the beta-6.0.0 version, which also clears the encrypted session on disconnect.

I checked that no log line from latest was dropped. 435 tests pass. Build and lint pass.


Generated by Claude Code

claude and others added 6 commits October 24, 2026 19:51
BLEConnection logged "Unexpected disconnect" for every disconnect it started
itself (the idle timer after each command, disconnectAll, a failed
connection), because nothing marked them as expected. Meanwhile a disconnect
started by the device (out of range, powered off) was never noticed: the dead
peripheral stayed in the connection map and the next command reused it.

- disconnect() is always intentional: it logs at debug level.
- A 'disconnect' listener on the peripheral drops the connection state
  (characteristics, encryption, pending reply) and warns only when the device
  dropped the link; markExpectedDisconnect() silences that warning.
- The characteristic-discovery failure path uses disconnect().

Supersedes #348.

Co-authored-by: dnicolson <dnicolson@users.noreply.github.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01TYWa2RXoWsaUTWh76oNv8s
Brings in the BLE logging changes from #351, #352 and #353. The one conflict was the disconnect fix that landed on both branches (#349, #350); the beta-6.0.0 version also clears the encrypted session.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01TYWa2RXoWsaUTWh76oNv8s
@donavanbecker
donavanbecker merged commit f96ebe9 into beta-6.0.0 Oct 30, 2026
2 checks passed
@donavanbecker
donavanbecker deleted the chore/sync-latest-into-6 branch October 30, 2026 17:27
@donavanbecker
donavanbecker restored the chore/sync-latest-into-6 branch October 30, 2026 17:44
@donavanbecker
donavanbecker deleted the chore/sync-latest-into-6 branch October 30, 2026 22:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants