Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-02-26 09:43:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

AP_Mount: fix where status_msg() is sent

Browse Source 
send to the channel where the trigger msg was sent from
This commit is contained in:
Michael Oborne 2014-06-18 12:03:18 +10:00 committed by Andrew Tridgell
parent b473f8fd4d
commit 30a3927ea8
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libraries/AP_Mount/AP_Mount.cpp
View File

@ -494,7 +494,7 @@ void AP_Mount::control_msg(mavlink_message_t *msg)
/// Return mount status information (depends on the previously set mount configuration) /// Return mount status information (depends on the previously set mount configuration)
/// triggered by a MavLink packet. /// triggered by a MavLink packet.
void AP_Mount::status_msg(mavlink_message_t *msg) void AP_Mount::status_msg(mavlink_message_t *msg, mavlink_channel_t chan)
{ {
__mavlink_mount_status_t packet; __mavlink_mount_status_t packet;
mavlink_msg_mount_status_decode(msg, &packet); mavlink_msg_mount_status_decode(msg, &packet);
@ -524,9 +524,7 @@ void AP_Mount::status_msg(mavlink_message_t *msg)
break; break;
} }
// status reply mavlink_msg_mount_status_send_buf(msg, chan, packet.target_system, packet.target_component,
// TODO: is COMM_3 correct ?
mavlink_msg_mount_status_send(MAVLINK_COMM_3, packet.target_system, packet.target_component,
packet.pointing_a, packet.pointing_b, packet.pointing_c); packet.pointing_a, packet.pointing_b, packet.pointing_c);
} }

2
libraries/AP_Mount/AP_Mount.h
View File

@ -52,7 +52,7 @@ public:
// MAVLink methods // MAVLink methods
void configure_msg(mavlink_message_t* msg); void configure_msg(mavlink_message_t* msg);
void control_msg(mavlink_message_t* msg); void control_msg(mavlink_message_t* msg);
void status_msg(mavlink_message_t* msg); void status_msg(mavlink_message_t* msg, mavlink_channel_t chan);
void set_roi_cmd(const struct Location *target_loc); void set_roi_cmd(const struct Location *target_loc);
void configure_cmd(); void configure_cmd();
void control_cmd(); void control_cmd();