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

Rover: use camera singleton to get camera rather than callback

Browse Source
This commit is contained in:
Peter Barker 2018-08-30 21:01:31 +10:00 committed by Peter Barker
parent 26e7abe6c4
commit 7c60c85a12
2 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
APMrover2/GCS_Mavlink.cpp
View File

@ -1268,15 +1268,6 @@ bool GCS_MAVLINK_Rover::accept_packet(const mavlink_status_t &status, mavlink_me
return (msg.sysid == rover.g.sysid_my_gcs);
}
AP_Camera *GCS_MAVLINK_Rover::get_camera() const
{
#if CAMERA == ENABLED
return &rover.camera;
#else
return nullptr;
#endif
}
AP_AdvancedFailsafe *GCS_MAVLINK_Rover::get_advanced_failsafe() const
{
#if ADVANCED_FAILSAFE == ENABLED

1
APMrover2/GCS_Mavlink.h
View File

@ -16,7 +16,6 @@ protected:
AP_Mission *get_mission() override;
AP_Rally *get_rally() const override;
AP_Camera *get_camera() const override;
AP_AdvancedFailsafe *get_advanced_failsafe() const override;
AP_VisualOdom *get_visual_odom() const override;