Mirrors_Framework/PX4-Autopilot
1
0
Fork 0
mirror of https://github.com/PX4/PX4-Autopilot.git synced 2026-05-27 02:06:27 +08:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Commander::handle_command() remove unused safety parameter

Browse Source
This commit is contained in:
Daniel Agar
2018-03-27 16:11:26 -04:00
parent e395b3578f
commit c547866029
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/commander/Commander.hpp
+1 -1
View File
@@ -92,7 +92,7 @@ private:
// Subscriptions // Subscriptions
Subscription<mission_result_s> _mission_result_sub; Subscription<mission_result_s> _mission_result_sub;
bool handle_command(vehicle_status_s *status_local, const safety_s &safety_local, const vehicle_command_s &cmd, bool handle_command(vehicle_status_s *status_local, const vehicle_command_s &cmd,
actuator_armed_s *armed_local, home_position_s *home, const vehicle_global_position_s &global_pos, actuator_armed_s *armed_local, home_position_s *home, const vehicle_global_position_s &global_pos,
const vehicle_local_position_s &local_pos, orb_advert_t *home_pub, orb_advert_t *command_ack_pub, bool *changed); const vehicle_local_position_s &local_pos, orb_advert_t *home_pub, orb_advert_t *command_ack_pub, bool *changed);
src/modules/commander/commander.cpp
+2 -2
View File
@@ -644,7 +644,7 @@ transition_result_t arm_disarm(bool arm, orb_advert_t *mavlink_log_pub_local, co
} }
bool bool
Commander::handle_command(vehicle_status_s *status_local, const safety_s& safety_local, Commander::handle_command(vehicle_status_s *status_local,
const vehicle_command_s& cmd, actuator_armed_s *armed_local, const vehicle_command_s& cmd, actuator_armed_s *armed_local,
home_position_s *home, const vehicle_global_position_s& global_pos, home_position_s *home, const vehicle_global_position_s& global_pos,
const vehicle_local_position_s& local_pos, orb_advert_t *home_pub, const vehicle_local_position_s& local_pos, orb_advert_t *home_pub,
@@ -2728,7 +2728,7 @@ Commander::run()
orb_copy(ORB_ID(vehicle_command), cmd_sub, &cmd); orb_copy(ORB_ID(vehicle_command), cmd_sub, &cmd);
/* handle it */ /* handle it */
if (handle_command(&status, safety, cmd, &armed, &_home, global_position, local_position, &home_pub, &command_ack_pub, &status_changed)) { if (handle_command(&status, cmd, &armed, &_home, global_position, local_position, &home_pub, &command_ack_pub, &status_changed)) {
status_changed = true; status_changed = true;
} }
} }