Skip to content

fix(util): update waitForTraceRoute reset logic #785

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’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ianmcorvidae merged 2 commits into from
Jun 9, 2025
Merged

fix(util): update waitForTraceRoute reset logic #785

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b4764d3
fix(util): update waitForTraceRoute reset logic
grleblanc Jun 9, 2025
04a0ff6
fix(util): fix typo
grleblanc Jun 9, 2025
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
7 changes: 3 additions & 4 deletions meshtastic/util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,9 +198,9 @@
self.sleepInterval: float = 0.1
self.expireTimeout: int = maxSecs

def reset(self) -> None:
def reset(self, expireTimeout=None):
"""Restart the waitForSet timer"""
self.expireTime = time.time() + self.expireTimeout
self.expireTime = time.time() + (self.expireTimeout if expireTimeout is None else expireTimeout)

def waitForSet(self, target, attrs=()) -> bool:
"""Block until the specified attributes are set. Returns True if config has been received."""
Expand All @@ -225,8 +225,7 @@

def waitForTraceRoute(self, waitFactor, acknowledgment, attr="receivedTraceRoute") -> bool:
"""Block until traceroute response is received. Returns True if traceroute response has been received."""
self.expireTimeout *= waitFactor
self.reset()
self.reset(self.expireTimeout * waitFactor)

Check warning on line 228 in meshtastic/util.py

View check run for this annotation

Codecov / codecov/patch

meshtastic/util.py#L228 

Added line #L228 was not covered by tests
while time.time() < self.expireTime:
if getattr(acknowledgment, attr, None):
acknowledgment.reset()
Expand Down
Loading