Browse Source

GCS_MAVLink: added routing object to GCS_MAVLink

master
Andrew Tridgell 10 years ago committed by Randy Mackay
parent
commit
11f88f0f5d
  1. 4
      libraries/GCS_MAVLink/GCS.h
  2. 3
      libraries/GCS_MAVLink/GCS_MAVLink.cpp

4
libraries/GCS_MAVLink/GCS.h

@ -14,6 +14,7 @@ @@ -14,6 +14,7 @@
#include <AP_Mission.h>
#include "../AP_BattMonitor/AP_BattMonitor.h"
#include <stdint.h>
#include <MAVLink_routing.h>
// GCS Message ID's
/// NOTE: to ensure we never block on sending MAVLink messages
@ -189,6 +190,9 @@ public: @@ -189,6 +190,9 @@ public:
// last time we got a non-zero RSSI from RADIO_STATUS
static uint32_t last_radio_status_remrssi_ms;
// mavlink routing object
static MAVLink_routing routing;
// common send functions
void send_meminfo(void);
void send_power_status(void);

3
libraries/GCS_MAVLink/GCS_MAVLink.cpp

@ -43,6 +43,9 @@ mavlink_system_t mavlink_system = {7,1}; @@ -43,6 +43,9 @@ mavlink_system_t mavlink_system = {7,1};
// mask of serial ports disabled to allow for SERIAL_CONTROL
static uint8_t mavlink_locked_mask;
// routing table
MAVLink_routing GCS_MAVLINK::routing;
/*
lock a channel, preventing use by MAVLink
*/

Loading…
Cancel
Save