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

Plane: move telemetry_delayed up into base class

Browse Source
This commit is contained in:
Peter Barker 2016-05-30 10:08:39 +10:00 committed by Andrew Tridgell
parent e977d85e0c
commit 28361afc2a
2 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ArduPlane/GCS_Mavlink.cpp
View File

@ -620,27 +620,15 @@ void Plane::send_current_waypoint(mavlink_channel_t chan)
mavlink_msg_mission_current_send(chan, mission.get_current_nav_index()); mavlink_msg_mission_current_send(chan, mission.get_current_nav_index());
} }
// are we still delaying telemetry to try to avoid Xbee bricking? uint32_t GCS_MAVLINK_Plane::telem_delay() const
bool Plane::telemetry_delayed(mavlink_channel_t chan)
{ {
uint32_t tnow = millis() >> 10; return (uint32_t)(plane.g.telem_delay);
if (tnow > (uint32_t)g.telem_delay) {
return false;
}
if (chan == MAVLINK_COMM_0 && hal.gpio->usb_connected()) {
// this is USB telemetry, so won't be an Xbee
return false;
}
// we're either on the 2nd UART, or no USB cable is connected
// we need to delay telemetry by the TELEM_DELAY time
return true;
} }
// try to send a message, return false if it won't fit in the serial tx buffer // try to send a message, return false if it won't fit in the serial tx buffer
bool GCS_MAVLINK_Plane::try_send_message(enum ap_message id) bool GCS_MAVLINK_Plane::try_send_message(enum ap_message id)
{ {
if (plane.telemetry_delayed(chan)) { if (telemetry_delayed(chan)) {
return false; return false;
} }

2
ArduPlane/GCS_Mavlink.h
View File

@ -11,6 +11,8 @@ public:
protected: protected:
uint32_t telem_delay() const override;
private: private:
void handleMessage(mavlink_message_t * msg) override; void handleMessage(mavlink_message_t * msg) override;