Skip to content

Add search duration check for exceeding 15 minutes#10293

Merged
thebentern merged 6 commits intomasterfrom
jp-bennett-patch-2
Apr 26, 2026
Merged

Add search duration check for exceeding 15 minutes#10293
thebentern merged 6 commits intomasterfrom
jp-bennett-patch-2

Conversation

@jp-bennett
Copy link
Copy Markdown
Collaborator

@jp-bennett jp-bennett commented Apr 25, 2026

Added a condition to check if the search duration exceeds 15 minutes, indicating too long of a search.

Received reports that the new 60 minute default was causing battery drain problems. Simple solution is to clamp the search time to 15 minutes.

@jp-bennett
Add search duration check for exceeding 15 minutes
85f8179 
Added a condition to check if the search duration exceeds 15 minutes, indicating too long of a search.
@github-actions github-actions Bot added the enhancement New feature or request label Apr 25, 2026
@jp-bennett jp-bennett added the bugfix Pull request that fixes bugs label Apr 25, 2026
@thebentern thebentern requested a review from Copilot April 25, 2026 10:54
Copilot AI reviewed Apr 25, 2026
View reviewed changes
Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Adds a hard upper bound to GPS search dwell time to mitigate battery drain caused by long default search durations.

Changes:

  • Add a 15-minute “searched too long” cutoff in GPSUpdateScheduling::searchedTooLong().

Comment thread src/gps/GPSUpdateScheduling.cpp Outdated
Comment thread src/gps/GPSUpdateScheduling.cpp Outdated
@thebentern
Copy link
Copy Markdown
Contributor

thebentern commented Apr 25, 2026

@copilot apply changes based on the comments in this thread

@thebentern
Fix searchedTooLong: move 15-min cap before UINT32_MAX check, cache e…
b6a5171 
…lapsed, add constexpr

Agent-Logs-Url: https://github.com/meshtastic/firmware/sessions/b7f74430-9e7e-4a6f-8095-6176c1eee972

Co-authored-by: thebentern <9000580+thebentern@users.noreply.github.com>
Copy link
Copy Markdown
Contributor

Copilot AI commented Apr 25, 2026

@copilot apply changes based on the comments in this thread

Applied both changes in b6a5171:

  1. Hard cap is now unconditional: the 15-minute check runs before the UINT32_MAX early-return, so an unlimited broadcast interval can no longer keep GPS searching indefinitely.
  2. Single elapsed call + named constexpr: elapsedSearchMs() is called once into uint32_t elapsed, and the threshold is constexpr uint32_t maxSearchClampMs = 1000UL * 60 * 15.

Copilot AI requested a review from thebentern April 25, 2026 11:07
@thebentern thebentern requested a review from Copilot April 25, 2026 11:33
Copilot AI reviewed Apr 25, 2026
View reviewed changes
Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Copilot reviewed 1 out of 1 changed files in this pull request and generated 1 comment.

Comment thread src/gps/GPSUpdateScheduling.cpp Outdated
thebentern and others added 2 commits April 25, 2026 06:39
@thebentern
Update src/gps/GPSUpdateScheduling.cpp
45ccb2c 
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
@thebentern
Merge branch 'master' into jp-bennett-patch-2
30db82e
@thebentern
Copy link
Copy Markdown
Contributor

thebentern commented Apr 25, 2026

@copilot you did a dumb... the if (maxSearchMs == UINT32_MAX) branch will never be reached now!

Copy link
Copy Markdown
Contributor

Copilot AI commented Apr 25, 2026

@copilot you did a dumb... the if (maxSearchMs == UINT32_MAX) branch will never be reached now!

Fixed in 5026bc5. getConfiguredOrDefaultMs always multiplies by 1000, so it can never produce exactly UINT32_MAX (4,294,967,295 is not divisible by 1000) — the branch was always dead code. Removed it entirely.

@thebentern thebentern requested a review from Copilot April 25, 2026 18:48
Copilot AI reviewed Apr 25, 2026
View reviewed changes
Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Copilot reviewed 1 out of 1 changed files in this pull request and generated 1 comment.

Comment thread src/gps/GPSUpdateScheduling.cpp
@thebentern thebentern merged commit 4ccdd80 into master Apr 26, 2026
79 of 82 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

Copilot code review Copilot Copilot left review comments

@thebentern thebentern thebentern approved these changes

Assignees

No one assigned

Labels

bugfix Pull request that fixes bugs enhancement New feature or request

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@jp-bennett @thebentern