Skip to content

Keep Bluetooth Proxy on for legacy BLE builds #93

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bharvey88 wants to merge 1 commit into
base: beta
Choose a base branch
from
Open

Keep Bluetooth Proxy on for legacy BLE builds #93

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions Integrations/ESPHome/Core.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
substitutions:
name: apollo-msr-2
version: "26.7.14.1"
version: "26.7.29.1"
device_description: ${name} made by Apollo Automation - version ${version}.
# Default update channel on first boot (no stored user choice yet, i.e. a
# fresh flash). The beta-channel builds override this to "Beta" (see
Expand All @@ -17,6 +17,12 @@ substitutions:
ota_stable_manifest: "${stable_manifest_base}/firmware/manifest.json"
ota_beta_manifest: "${beta_manifest_base}/manifest-standard.json"

# Bluetooth Proxy switch state on a device with no stored preference yet
# (first boot after this switch was added, or after a factory reset). The
# unified image ships the proxy off; MSR-2_BLE.yaml overrides this to ON so
# legacy BLE devices keep proxying instead of going quiet after an update.
bluetooth_proxy_restore_mode: RESTORE_DEFAULT_OFF

esphome:
# List form so package merging concatenates with each variant's own on_boot
# entries (mapping form would be replaced by the variant's block instead).
Expand All @@ -25,7 +31,7 @@ esphome:
then:
- script.execute: apply_ota_source
# Re-apply the Bluetooth Proxy switch after all components set up, so BLE
# scanning matches the persisted switch (proxy stays off by default).
# scanning matches the switch state restored from flash.
- priority: -300
then:
- if:
Expand Down Expand Up @@ -867,7 +873,7 @@ switch:
id: bluetooth_proxy_switch
icon: mdi:bluetooth
entity_category: "config"
restore_mode: RESTORE_DEFAULT_OFF
restore_mode: ${bluetooth_proxy_restore_mode}
optimistic: true
on_turn_on:
- esp32_ble_tracker.start_scan:
Expand Down
4 changes: 4 additions & 0 deletions Integrations/ESPHome/MSR-2_BLE.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@ substitutions:
ota_stable_manifest: "https://apolloautomation.github.io/MSR-2/firmware-ble/manifest.json"
ota_beta_manifest: "https://github.com/ApolloAutomation/MSR-2/releases/download/beta-fw/manifest-ble.json"

# Legacy BLE devices proxied unconditionally before the Bluetooth Proxy
# switch existed, so default it on rather than dropping the proxy on update.
bluetooth_proxy_restore_mode: RESTORE_DEFAULT_ON

esphome:
name: "${name}"
friendly_name: Apollo MSR-2
Expand Down
Loading