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

Plane: use camera singleton to get camera rather than callback

This commit is contained in:
Peter Barker 2018-08-30 21:02:09 +10:00 committed by Peter Barker
parent f005ee4a4c
commit 1aa75e4c3e
2 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ArduPlane/GCS_Mavlink.cpp
View File

@ -1610,15 +1610,6 @@ void GCS_MAVLINK_Plane::handle_mission_set_current(AP_Mission &mission, mavlink_
}
}
AP_Camera *GCS_MAVLINK_Plane::get_camera() const
{
#if CAMERA == ENABLED
return &plane.camera;
#else
return nullptr;
#endif
}
AP_AdvancedFailsafe *GCS_MAVLINK_Plane::get_advanced_failsafe() const
{
return &plane.afs;

1
ArduPlane/GCS_Mavlink.h
View File

@ -19,7 +19,6 @@ protected:
AP_Mission *get_mission() override;
void handle_mission_set_current(AP_Mission &mission, mavlink_message_t *msg) override;
AP_Camera *get_camera() const override;
AP_AdvancedFailsafe *get_advanced_failsafe() const override;
AP_Rally *get_rally() const override;