From 89f9fafb901cfe90487fed905b62b34723ae4949 Mon Sep 17 00:00:00 2001 From: "tridge60@gmail.com" Date: Sun, 4 Sep 2011 22:52:22 +0000 Subject: [PATCH] BetterSerial has txspace() now git-svn-id: https://arducopter.googlecode.com/svn/trunk@3248 f9c3cf11-9bcb-44bc-f272-b75c42450872 --- libraries/GCS_MAVLink/GCS_MAVLink.cpp | 4 ++-- libraries/GCS_MAVLink/GCS_MAVLink.h | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libraries/GCS_MAVLink/GCS_MAVLink.cpp b/libraries/GCS_MAVLink/GCS_MAVLink.cpp index e06ac78941..2cecade369 100644 --- a/libraries/GCS_MAVLink/GCS_MAVLink.cpp +++ b/libraries/GCS_MAVLink/GCS_MAVLink.cpp @@ -5,8 +5,8 @@ #include "GCS_MAVLink.h" -FastSerial *mavlink_comm_0_port; -FastSerial *mavlink_comm_1_port; +BetterStream *mavlink_comm_0_port; +BetterStream *mavlink_comm_1_port; // this might need to move to the flight software mavlink_system_t mavlink_system = {7,1,0,0}; diff --git a/libraries/GCS_MAVLink/GCS_MAVLink.h b/libraries/GCS_MAVLink/GCS_MAVLink.h index 06399d81b0..d89f3ee34d 100644 --- a/libraries/GCS_MAVLink/GCS_MAVLink.h +++ b/libraries/GCS_MAVLink/GCS_MAVLink.h @@ -6,7 +6,7 @@ #ifndef GCS_MAVLink_h #define GCS_MAVLink_h -#include +#include #include "include/ardupilotmega/version.h" @@ -17,10 +17,10 @@ #include "include/mavlink_types.h" /// MAVLink stream used for HIL interaction -extern FastSerial *mavlink_comm_0_port; +extern BetterStream *mavlink_comm_0_port; /// MAVLink stream used for ground control communication -extern FastSerial *mavlink_comm_1_port; +extern BetterStream *mavlink_comm_1_port; /// MAVLink system definition extern mavlink_system_t mavlink_system;