fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-07-03 16:30:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

commander/navigator: remove param NAV_RCL_ACT

Browse Source 
The param NAV_RCL_ACT was not implemented as described. Also, it has the
completely the wrong name. It should be a COM param and not NAV.
Therefore, remove the param and delete the partly implemented
and probably never used functionality.
This commit is contained in:
Julian Oes
2016-06-05 14:27:57 +02:00
committed by Lorenz Meier
parent ea10c8c8a3
commit 016d514d80
4 changed files with 3 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/commander/state_machine_helper.cpp
+2 -2
View File
@@ -588,7 +588,7 @@ transition_result_t hil_state_transition(hil_state_t new_state, orb_advert_t sta
*/
bool set_nav_state(struct vehicle_status_s *status, struct commander_state_s *internal_state,
const bool data_link_loss_enabled, const bool mission_finished,
const bool stay_in_failsafe, status_flags_s *status_flags, bool landed, const bool rc_loss_enabled,
const bool stay_in_failsafe, status_flags_s *status_flags, bool landed,
const int offb_loss_act, const int offb_loss_rc_act)
{
navigation_state_t nav_state_old = status->nav_state;
@@ -605,7 +605,7 @@ bool set_nav_state(struct vehicle_status_s *status, struct commander_state_s *in
case commander_state_s::MAIN_STATE_ALTCTL:
case commander_state_s::MAIN_STATE_POSCTL:
/* require RC for all manual modes */
if (rc_loss_enabled && (status->rc_signal_lost || status_flags->rc_signal_lost_cmd) && armed && !landed) {
if ((status->rc_signal_lost || status_flags->rc_signal_lost_cmd) && armed && !landed) {
status->failsafe = true;
if (status_flags->condition_global_position_valid && status_flags->condition_home_position_valid) {