Skip to content
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

Revert "FLightTaskAuto: limit nudging speed based on distance sensor" #24212

Merged
merged 1 commit into from
Jan 21, 2025

Conversation

MaEtUgR
Copy link
Member

@MaEtUgR MaEtUgR commented Jan 14, 2025

Solved Problem

I got the feedback from @jongell that the feature I introduced in #22690 is not generally useful but necessary on a specific platform so I suggest to remove it again and only have the few lines on that platform.

Solution

This reverts commit 97cb933.

Changelog Entry

For release notes:

Remove feature: Limit land nudging horizontal speed close to the ground

Alternatives

I could leave it, make it configurable and disabled by default but in my eyes that's not worth it and just adds dead code complexity for everyone.

@MaEtUgR MaEtUgR requested a review from RomanBapst January 14, 2025 09:43
@MaEtUgR MaEtUgR self-assigned this Jan 14, 2025
Copy link

🔎 FLASH Analysis

px4_fmu-v5x [Total VM Diff: -64 byte (-0 %)]
    FILE SIZE        VM SIZE    
--------------  -------------- 
+0.0%     +56  [ = ]       0    .debug_abbrev
   +11%     +56  [ = ]       0    ../../src/lib/version/version.c
-0.0%      -8  [ = ]       0    .debug_aranges
  -5.0%      -8  [ = ]       0    ../../src/lib/version/version.c
-0.0%    -149  [ = ]       0    .debug_info
  -0.2%      -4  [ = ]       0    ../../src/lib/version/version.c
  -0.1%    -145  [ = ]       0    ../../src/modules/flight_mode_manager/tasks/Auto/FlightTaskAuto.cpp
+0.0%     +37  [ = ]       0    .debug_line
  -1.3%     -25  [ = ]       0    ../../src/lib/version/version.c
  +0.3%     +68  [ = ]       0    ../../src/modules/flight_mode_manager/tasks/Auto/FlightTaskAuto.cpp
  -0.5%      -6  [ = ]       0    task/task_cancelpt.c
-0.0%    -128  [ = ]       0    .debug_loc
  -0.3%    -128  [ = ]       0    ../../src/modules/flight_mode_manager/tasks/Auto/FlightTaskAuto.cpp
-0.0%     -32  [ = ]       0    .debug_ranges
  -2.6%      -8  [ = ]       0    ../../src/lib/version/version.c
  -0.3%     -24  [ = ]       0    ../../src/modules/flight_mode_manager/tasks/Auto/FlightTaskAuto.cpp
+0.6%     +64  [ = ]       0    [Unmapped]
-0.0%     -64  -0.0%     -64    .text
  -0.9%     -64  -0.9%     -64    ../../src/modules/flight_mode_manager/tasks/Auto/FlightTaskAuto.cpp
-0.0%    -224  -0.0%     -64    TOTAL

px4_fmu-v6x [Total VM Diff: -64 byte (-0 %)]
    FILE SIZE        VM SIZE    
--------------  -------------- 
+0.0%     +56  [ = ]       0    .debug_abbrev
   +11%     +56  [ = ]       0    ../../src/lib/version/version.c
-0.0%      -8  [ = ]       0    .debug_aranges
  -5.0%      -8  [ = ]       0    ../../src/lib/version/version.c
-0.0%    -149  [ = ]       0    .debug_info
  -0.2%      -4  [ = ]       0    ../../src/lib/version/version.c
  -0.1%    -145  [ = ]       0    ../../src/modules/flight_mode_manager/tasks/Auto/FlightTaskAuto.cpp
+0.0%     +45  [ = ]       0    .debug_line
  -1.3%     -25  [ = ]       0    ../../src/lib/version/version.c
  +0.3%     +68  [ = ]       0    ../../src/modules/flight_mode_manager/tasks/Auto/FlightTaskAuto.cpp
  +0.2%      +2  [ = ]       0    task/task_cancelpt.c
-0.0%    -128  [ = ]       0    .debug_loc
  -0.3%    -128  [ = ]       0    ../../src/modules/flight_mode_manager/tasks/Auto/FlightTaskAuto.cpp
-0.0%     -32  [ = ]       0    .debug_ranges
  -2.6%      -8  [ = ]       0    ../../src/lib/version/version.c
  -0.3%     -24  [ = ]       0    ../../src/modules/flight_mode_manager/tasks/Auto/FlightTaskAuto.cpp
+0.1%     +64  [ = ]       0    [Unmapped]
-0.0%     -64  -0.0%     -64    .text
  -0.9%     -64  -0.9%     -64    ../../src/modules/flight_mode_manager/tasks/Auto/FlightTaskAuto.cpp
-0.0%    -216  -0.0%     -64    TOTAL

Updated: 2025-01-14T09:48:34

@MaEtUgR
Copy link
Member Author

MaEtUgR commented Jan 21, 2025

@RomanBapst I'm merging this since we agreed this should not be part of every VTOLs guidance and I'm purely removing the lines I added in #22690

@MaEtUgR MaEtUgR merged commit af062c8 into main Jan 21, 2025
58 of 61 checks passed
@MaEtUgR MaEtUgR deleted the maetugr/remove-nudging-slow-down branch January 21, 2025 08:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant