Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-02-04 23:18:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

Plane: move devo telemetry handling to GCS

Browse Source
This commit is contained in:
Peter Barker 2019-03-01 19:01:55 +11:00 committed by Peter Barker
parent 451f5f17ce
commit 6c5c14381f
2 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ArduPlane/Plane.h
View File

@ -81,7 +81,6 @@
#include <AP_BoardConfig/AP_BoardConfig.h> #include <AP_BoardConfig/AP_BoardConfig.h>
#include <AP_BoardConfig/AP_BoardConfig_CAN.h> #include <AP_BoardConfig/AP_BoardConfig_CAN.h>
#include <AP_Frsky_Telem/AP_Frsky_Telem.h> #include <AP_Frsky_Telem/AP_Frsky_Telem.h>
#include <AP_Devo_Telem/AP_Devo_Telem.h>
#include <AP_OSD/AP_OSD.h> #include <AP_OSD/AP_OSD.h>
#include <AP_ServoRelayEvents/AP_ServoRelayEvents.h> #include <AP_ServoRelayEvents/AP_ServoRelayEvents.h>
@ -405,11 +404,6 @@ private:
FUNCTOR_BIND_MEMBER(&Plane::handle_battery_failsafe, void, const char*, const int8_t), FUNCTOR_BIND_MEMBER(&Plane::handle_battery_failsafe, void, const char*, const int8_t),
_failsafe_priorities}; _failsafe_priorities};
#if DEVO_TELEM_ENABLED == ENABLED
// DEVO-M telemetry support
AP_DEVO_Telem devo_telemetry;
#endif
// Airspeed Sensors // Airspeed Sensors
AP_Airspeed airspeed; AP_Airspeed airspeed;

8
ArduPlane/system.cpp
View File

@ -96,10 +96,6 @@ void Plane::init_ardupilot()
// setup telem slots with serial ports // setup telem slots with serial ports
gcs().setup_uarts(serial_manager); gcs().setup_uarts(serial_manager);
#if DEVO_TELEM_ENABLED == ENABLED
devo_telemetry.init();
#endif
#if OSD_ENABLED == ENABLED #if OSD_ENABLED == ENABLED
osd.init(); osd.init();
#endif #endif
@ -303,10 +299,6 @@ void Plane::set_mode(enum FlightMode mode, mode_reason_t reason)
previous_mode_reason = control_mode_reason; previous_mode_reason = control_mode_reason;
control_mode_reason = reason; control_mode_reason = reason;
#if DEVO_TELEM_ENABLED == ENABLED
devo_telemetry.update_control_mode(control_mode);
#endif
#if CAMERA == ENABLED #if CAMERA == ENABLED
camera.set_is_auto_mode(control_mode == AUTO); camera.set_is_auto_mode(control_mode == AUTO);
#endif #endif