-
Notifications
You must be signed in to change notification settings - Fork 13.7k
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.
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
Fix deadlock in fog detection logic and improved unit test #24304
Open
RomanBapst
wants to merge
2
commits into
main
Choose a base branch
from
pr-fog_fix
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+3
−3
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: RomanBapst <[email protected]>
Signed-off-by: RomanBapst <[email protected]>
🔎 FLASH Analysispx4_fmu-v5x [Total VM Diff: -48 byte (-0 %)]
px4_fmu-v6x [Total VM Diff: -56 byte (-0 %)]
Updated: 2025-02-07T13:51:27 |
haumarco
reviewed
Feb 7, 2025
@@ -149,7 +149,7 @@ void SensorRangeFinder::updateStuckCheck() | |||
|
|||
void SensorRangeFinder::updateFogCheck(const float dist_bottom, const uint64_t time_us) | |||
{ | |||
if (_max_fog_dist > 0.f && time_us - _time_last_valid_us < 1e6) { | |||
if (_max_fog_dist > 0.f) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should we not only check for fog-blockage when we know that the range data is otherwise good during the last second?
I didn't check for is_blocked
and is_stuck
directly since they have a hysteresis.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Solved Problem
If the range finder detected fog for more than 1 second, the range finder could never be declared valid anymore due to a deadlock.
Fixes #{Github issue ID}
Solution
Remove condition which requires data to have been valid for the last second from the fog checks. This is to make sure that the fog detection logic can reset itself.
I also fixed the unit tests.
Changelog Entry
For release notes:
Alternatives
We could also ...
Test coverage
Context
Related links, screenshot before/after, video