mirror of
https://github.com/MarekZegare4/MeshCore-Solo.git
synced 2026-07-26 23:08:11 +00:00
feat(companion): geo-alert beeper overrides buzzer mute
The proximity beeper is its own opt-in toggle, so enabling it is an explicit "I want to hear this" — drop the isBuzzerQuiet() guard so it ticks even when the global buzzer is muted (manual Off or BT auto-mute). The arrive/leave crossing alert has no dedicated toggle and keeps respecting the mute. Docs updated. Verified: WioTrackerL1_companion_solo_dual builds clean. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
@@ -241,7 +241,7 @@ Navigate with **UP/DOWN**, change a value with **LEFT/RIGHT** (or **Enter**); **
|
||||
|
||||
**Following a person.** With a **live-contact** target, the geofence tracks the distance *between you and them* using their latest shared position, so it works even while both of you move. If they stop sharing (their share goes stale), evaluation pauses until a fresh position arrives — it never alerts on an outdated fix. Only contacts whose shares are **DM-verified** can be targeted (a channel share carries no stable identity to lock onto).
|
||||
|
||||
**Proximity beeper.** With **Beeper** on, the device also ticks while you're inside the radius and **shortens the gap between ticks the closer you get to the target** — slow near the edge, rapid near the centre — like a homing beeper guiding you to the exact spot. It's silent outside the radius and respects the buzzer mute (**Settings › Sound › Buzzer**). It works independently of the arrive/leave alert, so you can use either or both.
|
||||
**Proximity beeper.** With **Beeper** on, the device also ticks while you're inside the radius and **shortens the gap between ticks the closer you get to the target** — slow near the edge, rapid near the centre — like a homing beeper guiding you to the exact spot. It's silent outside the radius. Because the beeper is its own opt-in toggle, turning it on **overrides the global buzzer mute** (**Settings › Sound › Buzzer**) — it's an explicit "I want to hear this". It works independently of the arrive/leave crossing alert (which does follow the mute), so you can use either or both.
|
||||
|
||||
> [!TIP]
|
||||
> Mark the spot first with **Tools › Trail → Hold Enter → Mark here** (or **+ Add by coords**), then set it as the Geo Alert target.
|
||||
|
||||
@@ -2188,12 +2188,14 @@ void UITask::fireGeoAlert(bool arrived) {
|
||||
// Homing beeper: while armed with a target and inside the radius, emit a short
|
||||
// tick whose interval shrinks linearly with distance — slow at the edge, rapid
|
||||
// near the centre. Polls distance a few times a second; silent outside the
|
||||
// radius and when the buzzer is muted.
|
||||
// radius. The beeper has its own toggle (geo_alert_beeper), so turning it on is
|
||||
// an explicit "I want to hear this" — it deliberately overrides the global
|
||||
// buzzer mute (playMelody → buzzer.playForced ignores the quiet flag).
|
||||
void UITask::geoProximityBeeper() {
|
||||
static const uint32_t BEEP_MIN_MS = 150; // fastest cadence (at the target)
|
||||
static const uint32_t BEEP_MAX_MS = 2000; // slowest cadence (at the edge)
|
||||
if (!_node_prefs || !_node_prefs->geo_alert_enabled || !_node_prefs->geo_alert_beeper
|
||||
|| !_node_prefs->geo_alert_has_target || isBuzzerQuiet()) {
|
||||
|| !_node_prefs->geo_alert_has_target) {
|
||||
return;
|
||||
}
|
||||
if ((int32_t)(millis() - _geo_beep_check_ms) < 0) return;
|
||||
|
||||
Reference in New Issue
Block a user