mirror of https://github.com/ArduPilot/ardupilot
MAVLink: removed the cpp part of the library
this was preventing building MAVLink 1.0 with the arduino GUI as we can't set cpp defines
This commit is contained in:
parent
9bf8d60dae
commit
fef4134702
|
@ -1,27 +0,0 @@
|
|||
// -*- tab-width: 4; Mode: C++; c-basic-offset: 4; indent-tabs-mode: t -*-
|
||||
|
||||
/// @file GCS_MAVLink.cpp
|
||||
/// @brief Supporting bits for MAVLink.
|
||||
|
||||
#include "GCS_MAVLink.h"
|
||||
|
||||
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};
|
||||
|
||||
#ifdef MAVLINK10
|
||||
# include "include/mavlink/v1.0/mavlink_helpers.h"
|
||||
#else
|
||||
# include "include/mavlink/v0.9/mavlink_helpers.h"
|
||||
#endif
|
||||
|
||||
uint8_t mavlink_check_target(uint8_t sysid, uint8_t compid)
|
||||
{
|
||||
if (sysid != mavlink_system.sysid)
|
||||
return 1;
|
||||
// Currently we are not checking for correct compid since APM is not passing mavlink info to any subsystem
|
||||
// If it is addressed to our system ID we assume it is for us
|
||||
return 0; // no error
|
||||
}
|
|
@ -8,7 +8,9 @@
|
|||
|
||||
#include <BetterStream.h>
|
||||
|
||||
#define MAVLINK_SEPARATE_HELPERS
|
||||
// we have separate helpers disabled to make it possible
|
||||
// to select MAVLink 1.0 in the arduino GUI build
|
||||
//#define MAVLINK_SEPARATE_HELPERS
|
||||
|
||||
#ifdef MAVLINK10
|
||||
# include "include/mavlink/v1.0/ardupilotmega/version.h"
|
||||
|
|
Loading…
Reference in New Issue