From 1a963e4d04cd1cbd247b1bfe3457bfa7658c765b Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Fri, 26 Apr 2019 14:37:11 -0700 Subject: [PATCH] Fix no serial and android builds --- src/AutoPilotPlugins/APM/APMAutoPilotPlugin.cc | 4 ++++ src/AutoPilotPlugins/APM/APMAutoPilotPlugin.h | 2 ++ 2 files changed, 6 insertions(+) diff --git a/src/AutoPilotPlugins/APM/APMAutoPilotPlugin.cc b/src/AutoPilotPlugins/APM/APMAutoPilotPlugin.cc index 476d0eb..dcd78df 100644 --- a/src/AutoPilotPlugins/APM/APMAutoPilotPlugin.cc +++ b/src/AutoPilotPlugins/APM/APMAutoPilotPlugin.cc @@ -54,7 +54,9 @@ APMAutoPilotPlugin::APMAutoPilotPlugin(Vehicle* vehicle, QObject* parent) { APMAirframeLoader::loadAirframeFactMetaData(); +#if !defined(NO_SERIAL_LINK) && !defined(__android__) connect(vehicle->parameterManager(), &ParameterManager::parametersReadyChanged, this, &APMAutoPilotPlugin::_checkForBadCubeBlack); +#endif } APMAutoPilotPlugin::~APMAutoPilotPlugin() @@ -176,6 +178,7 @@ QString APMAutoPilotPlugin::prerequisiteSetup(VehicleComponent* component) const return QString(); } +#if !defined(NO_SERIAL_LINK) && !defined(__android__) /// The following code is executed when the Vehicle is parameter ready. It checks for the service bulletin against Cube Blacks. void APMAutoPilotPlugin::_checkForBadCubeBlack(void) { @@ -204,3 +207,4 @@ void APMAutoPilotPlugin::_checkForBadCubeBlack(void) } } +#endif diff --git a/src/AutoPilotPlugins/APM/APMAutoPilotPlugin.h b/src/AutoPilotPlugins/APM/APMAutoPilotPlugin.h index 83785af..5c6a5ac 100644 --- a/src/AutoPilotPlugins/APM/APMAutoPilotPlugin.h +++ b/src/AutoPilotPlugins/APM/APMAutoPilotPlugin.h @@ -59,8 +59,10 @@ protected: ESP8266Component* _esp8266Component; APMHeliComponent* _heliComponent; +#if !defined(NO_SERIAL_LINK) && !defined(__android__) private slots: void _checkForBadCubeBlack(void); +#endif private: QVariantList _components;