aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Copter: move devo telemetry handling to GCS

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

8
ArduCopter/Copter.h
View File

@ -140,10 +140,6 @@
# include <AP_Camera/AP_Camera.h> # include <AP_Camera/AP_Camera.h>
#endif #endif
#if DEVO_TELEM_ENABLED == ENABLED
#include <AP_Devo_Telem/AP_Devo_Telem.h>
#endif
#if OSD_ENABLED == ENABLED #if OSD_ENABLED == ENABLED
#include <AP_OSD/AP_OSD.h> #include <AP_OSD/AP_OSD.h>
#endif #endif
@ -401,10 +397,6 @@ private:
FUNCTOR_BIND_MEMBER(&Copter::handle_battery_failsafe, void, const char*, const int8_t), FUNCTOR_BIND_MEMBER(&Copter::handle_battery_failsafe, void, const char*, const int8_t),
_failsafe_priorities}; _failsafe_priorities};
#if DEVO_TELEM_ENABLED == ENABLED
AP_DEVO_Telem devo_telemetry;
#endif
#if OSD_ENABLED == ENABLED #if OSD_ENABLED == ENABLED
AP_OSD osd; AP_OSD osd;
#endif #endif

4
ArduCopter/mode.cpp
View File

@ -234,10 +234,6 @@ bool Copter::set_mode(control_mode_t mode, mode_reason_t reason)
fence.manual_recovery_start(); fence.manual_recovery_start();
#endif #endif
#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

5
ArduCopter/system.cpp
View File

@ -87,11 +87,6 @@ void Copter::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
// setup devo
devo_telemetry.init();
#endif
#if OSD_ENABLED == ENABLED #if OSD_ENABLED == ENABLED
osd.init(); osd.init();
#endif #endif