Browse Source

Copter: move try_send_message send_hwstatus up

master
Peter Barker 8 years ago committed by Francisco Ferreira
parent
commit
431e3443bd
  1. 1
      ArduCopter/Copter.h
  2. 13
      ArduCopter/GCS_Mavlink.cpp

1
ArduCopter/Copter.h

@ -706,7 +706,6 @@ private: @@ -706,7 +706,6 @@ private:
void send_location(mavlink_channel_t chan);
void send_nav_controller_output(mavlink_channel_t chan);
void send_simstate(mavlink_channel_t chan);
void send_hwstatus(mavlink_channel_t chan);
void send_vfr_hud(mavlink_channel_t chan);
void send_rpm(mavlink_channel_t chan);
void rpm_update();

13
ArduCopter/GCS_Mavlink.cpp

@ -182,14 +182,6 @@ void NOINLINE Copter::send_simstate(mavlink_channel_t chan) @@ -182,14 +182,6 @@ void NOINLINE Copter::send_simstate(mavlink_channel_t chan)
#endif
}
void NOINLINE Copter::send_hwstatus(mavlink_channel_t chan)
{
mavlink_msg_hwstatus_send(
chan,
hal.analogin->board_voltage()*1000,
0);
}
void NOINLINE Copter::send_vfr_hud(mavlink_channel_t chan)
{
mavlink_msg_vfr_hud_send(
@ -445,11 +437,6 @@ bool GCS_MAVLINK_Copter::try_send_message(enum ap_message id) @@ -445,11 +437,6 @@ bool GCS_MAVLINK_Copter::try_send_message(enum ap_message id)
send_ahrs2(copter.ahrs);
break;
case MSG_HWSTATUS:
CHECK_PAYLOAD_SIZE(HWSTATUS);
copter.send_hwstatus(chan);
break;
case MSG_MOUNT_STATUS:
#if MOUNT == ENABLED
CHECK_PAYLOAD_SIZE(MOUNT_STATUS);

Loading…
Cancel
Save