Skip to content

Keep Bluetooth Proxy on for legacy BLE builds - #121

Merged
bharvey88 merged 2 commits into
betafrom
fix/ble-proxy-restore-on
Aug 18, 2026
Merged

bharvey88 merged 2 commits into
betafrom
fix/ble-proxy-restore-on

Conversation

@bharvey88

@bharvey88 bharvey88 commented Jul 29, 2026 •

Copy link
Copy Markdown
Contributor

Version: 26.7.29.1

What does this implement/fix?

The Bluetooth Proxy switch does restore from flash, but the _OFF half of
RESTORE_DEFAULT_OFF only decides the boot where nothing is stored yet, which is
the first boot after the switch shipped. AIR-1_BLE.yaml inherited that mode from
Core, so a legacy BLE device that had always proxied comes up with the proxy off
after updating and stays that way until the user finds the switch. Reported in ApolloAutomation/MSR-2#92.

Core now reads the mode from a bluetooth_proxy_restore_mode substitution
defaulting to RESTORE_DEFAULT_OFF, and AIR-1_BLE.yaml overrides it to
RESTORE_DEFAULT_ON, the same override pattern that file already uses for its OTA
manifest URLs. The unified image is unchanged, and a user's saved choice still wins
on every later boot.

Validated with esphome config on 2026.7.2 across AIR-1.yaml, AIR-1_BLE.yaml
and AIR-1_Factory.yaml. Rendered switch: standard RESTORE_DEFAULT_OFF, BLE
RESTORE_DEFAULT_ON.

Matching PRs go to MSR-1, MSR-2 and MTR-1, which carry the identical switch and BLE variant.

Types of changes

  • Bugfix (fixed change that fixes an issue)
  • New feature (thanks!)
  • Breaking change (repair/feature that breaks existing functionality)
  • Dependency Update - Does not publish
  • Other - Does not publish
  • Website of github readme file update - Does not publish
  • Github workflows - Does not publish

Checklist / Checklijst:

  • The code change has been tested and works locally
  • The code change has not yet been tested

If user-visible functionality or configuration variables are added/modified:

  • Added/updated documentation for the web page

🤖 Generated with Claude Code

Summary by CodeRabbit

  • New Features

    • Added configurable Bluetooth Proxy restore behavior for different device variants.
    • Legacy BLE devices now continue receiving Bluetooth Proxy updates after firmware updates.
    • Bluetooth Proxy state can now be restored from saved settings.
  • Bug Fixes

    • Improved consistency between the restored Bluetooth Proxy state and its switch status.
  • Chores

    • Updated the device firmware configuration version.

The Bluetooth Proxy switch does restore from flash, but the _OFF half of
RESTORE_DEFAULT_OFF decides the boot where nothing is stored yet, which is
the first boot after the switch shipped. AIR-1_BLE.yaml inherited that mode
from Core, so legacy BLE devices that had always proxied came up with the
proxy off after updating.

Core now reads the mode from a bluetooth_proxy_restore_mode substitution
defaulting to RESTORE_DEFAULT_OFF, and AIR-1_BLE.yaml overrides it to
RESTORE_DEFAULT_ON, the same override pattern the file already uses for its
OTA manifest URLs. The unified image is unchanged and a user's saved choice
still wins on every later boot.

Refs ApolloAutomation/MSR-2#92

🤖 Generated with [Claude Code](https://claude.com/claude-code)
@coderabbitai

coderabbitai Bot commented Jul 29, 2026 •

Copy link
Copy Markdown

Review Change Stack

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro Plus

Run ID: f976a84c-9598-43b9-9172-60551a9abe89

📥 Commits

Reviewing files that changed from the base of the PR and between e0dbeb6 and 6e1ac71.

📒 Files selected for processing (1)
  • Integrations/ESPHome/Core.yaml
🚧 Files skipped from review as they are similar to previous changes (1)
  • Integrations/ESPHome/Core.yaml

Included review availability: Your plan includes up to 2 reviews per rolling hour; 1 remains after this review.


Walkthrough

The ESPHome core configuration now uses a configurable Bluetooth Proxy restore mode. The BLE variant sets this mode to restore on, while the core default remains restore off. Related boot documentation and the AIR-1 version are updated.

Changes

Bluetooth Proxy restore configuration

Layer / File(s) Summary
Core restore-mode configuration
Integrations/ESPHome/Core.yaml
Adds the bluetooth_proxy_restore_mode substitution, uses it for the Bluetooth Proxy switch, updates the boot comment, and bumps the version.
Legacy BLE restore override
Integrations/ESPHome/AIR-1_BLE.yaml
Sets the restore mode to RESTORE_DEFAULT_ON for legacy BLE devices.

Estimated code review effort: 2 (Simple) | ~10 minutes

Merge Risk: ⚪ Minimal · up to 6e1ac

This change preserves Bluetooth Proxy behavior for legacy BLE builds while retaining users’ saved choices, and no actionable merge-blocking risk remains after normal checks and review.

Poem

I’m a rabbit by the proxy door,
BLE friends wake as before.
Core restores off by default,
Legacy mode keeps service aloft.
Hop, hop—updates pass once more!

🚥 Pre-merge checks | ✅ 5
✅ Passed checks (5 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title clearly summarizes the main change: keeping Bluetooth Proxy enabled by default for legacy BLE builds.
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch fix/ble-proxy-restore-on

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

Re-dated for the merge day per versioning policy.

🤖 Generated with [Claude Code](https://claude.com/claude-code)
@bharvey88
bharvey88 merged commit b218928 into beta Aug 18, 2026
13 checks passed
@bharvey88
bharvey88 deleted the fix/ble-proxy-restore-on branch August 18, 2026 15:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bugfix Bug fix

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant