aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Copter: move sending of sim state up

Browse Source
This commit is contained in:
Peter Barker 2018-01-02 09:21:21 +11:00 committed by Peter Barker
parent e9d2be143a
commit 81e9edd80a
2 changed files with 0 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ArduCopter/Copter.h
View File

@ -761,7 +761,6 @@ private:
void send_fence_status(mavlink_channel_t chan);
void send_extended_status1(mavlink_channel_t chan);
void send_nav_controller_output(mavlink_channel_t chan);
void send_simstate(mavlink_channel_t chan);
void send_vfr_hud(mavlink_channel_t chan);
void send_rpm(mavlink_channel_t chan);
void send_pid_tuning(mavlink_channel_t chan);

17
ArduCopter/GCS_Mavlink.cpp
View File

@ -171,14 +171,6 @@ void NOINLINE Copter::send_nav_controller_output(mavlink_channel_t chan)
0);
}
// report simulator state
void NOINLINE Copter::send_simstate(mavlink_channel_t chan)
{
#if CONFIG_HAL_BOARD == HAL_BOARD_SITL
sitl.simstate_send(chan);
#endif
}
void NOINLINE Copter::send_vfr_hud(mavlink_channel_t chan)
{
mavlink_msg_vfr_hud_send(
@ -342,15 +334,6 @@ bool GCS_MAVLINK_Copter::try_send_message(enum ap_message id)
#endif
break;
case MSG_SIMSTATE:
#if CONFIG_HAL_BOARD == HAL_BOARD_SITL
CHECK_PAYLOAD_SIZE(SIMSTATE);
copter.send_simstate(chan);
#endif
CHECK_PAYLOAD_SIZE(AHRS2);
send_ahrs2();
break;
case MSG_MOUNT_STATUS:
#if MOUNT == ENABLED
CHECK_PAYLOAD_SIZE(MOUNT_STATUS);