Browse Source

Commander::handle_command() remove unused safety parameter

sbg
Daniel Agar 7 years ago
parent
commit
c547866029
  1. 2
      src/modules/commander/Commander.hpp
  2. 4
      src/modules/commander/commander.cpp

2
src/modules/commander/Commander.hpp

@ -92,7 +92,7 @@ private: @@ -92,7 +92,7 @@ private:
// Subscriptions
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,
const vehicle_local_position_s &local_pos, orb_advert_t *home_pub, orb_advert_t *command_ack_pub, bool *changed);

4
src/modules/commander/commander.cpp

@ -644,7 +644,7 @@ transition_result_t arm_disarm(bool arm, orb_advert_t *mavlink_log_pub_local, co @@ -644,7 +644,7 @@ transition_result_t arm_disarm(bool arm, orb_advert_t *mavlink_log_pub_local, co
}
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,
home_position_s *home, const vehicle_global_position_s& global_pos,
const vehicle_local_position_s& local_pos, orb_advert_t *home_pub,
@ -2728,7 +2728,7 @@ Commander::run() @@ -2728,7 +2728,7 @@ Commander::run()
orb_copy(ORB_ID(vehicle_command), cmd_sub, &cmd);
/* 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;
}
}

Loading…
Cancel
Save