Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GCS_MAVLink: port to work with AP_HAL class rather than FastSerial

This commit is contained in:
Pat Hickey 2012-09-18 11:08:57 -07:00 committed by Andrew Tridgell
parent f2b21ecc41
commit 6661f827fa
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libraries/GCS_MAVLink/GCS_MAVLink.cpp
View File

@ -11,7 +11,7 @@ License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
*/
#include <FastSerial.h>
#include <AP_HAL.h>
#include <AP_Common.h>
#include <GCS_MAVLink.h>
@ -20,8 +20,8 @@ version 2.1 of the License, or (at your option) any later version.
#endif
BetterStream *mavlink_comm_0_port;
BetterStream *mavlink_comm_1_port;
AP_HAL::BetterStream *mavlink_comm_0_port;
AP_HAL::BetterStream *mavlink_comm_1_port;
mavlink_system_t mavlink_system = {7,1,0,0};

6
libraries/GCS_MAVLink/GCS_MAVLink.h
View File

@ -6,8 +6,8 @@
#ifndef GCS_MAVLink_h
#define GCS_MAVLink_h
#include <AP_HAL.h>
#include <AP_Param.h>
#include <BetterStream.h>
// we have separate helpers disabled to make it possible
// to select MAVLink 1.0 in the arduino GUI build
@ -24,10 +24,10 @@
#include "include/mavlink/v1.0/mavlink_types.h"
/// MAVLink stream used for HIL interaction
extern BetterStream *mavlink_comm_0_port;
extern AP_HAL::BetterStream *mavlink_comm_0_port;
/// MAVLink stream used for ground control communication
extern BetterStream *mavlink_comm_1_port;
extern AP_HAL::BetterStream *mavlink_comm_1_port;
/// MAVLink system definition
extern mavlink_system_t mavlink_system;