From bb91ea90cbbbe03ee859b0b3f9957412a5fd479c Mon Sep 17 00:00:00 2001 From: Peter Barker Date: Wed, 4 Dec 2019 12:49:22 +1100 Subject: [PATCH] Tracker: consolidate camera dummy functions into system.cpp --- AntennaTracker/camera.cpp | 13 ------------- AntennaTracker/system.cpp | 7 +++++++ 2 files changed, 7 insertions(+), 13 deletions(-) delete mode 100644 AntennaTracker/camera.cpp diff --git a/AntennaTracker/camera.cpp b/AntennaTracker/camera.cpp deleted file mode 100644 index 9c582e8396..0000000000 --- a/AntennaTracker/camera.cpp +++ /dev/null @@ -1,13 +0,0 @@ -/* dummy methods to avoid having to link against AP_Camera */ - -#include - -namespace AP { - AP_Camera *camera() { - return nullptr; - } -}; - -void AP_Camera::take_picture() -{ -} diff --git a/AntennaTracker/system.cpp b/AntennaTracker/system.cpp index 07a3cce18a..5e71358135 100644 --- a/AntennaTracker/system.cpp +++ b/AntennaTracker/system.cpp @@ -275,6 +275,13 @@ void AP_Camera::control_msg(const mavlink_message_t &) {} void AP_Camera::configure(float, float, float, float, float, float, float) {} void AP_Camera::control(float, float, float, float, float, float) {} void AP_Camera::send_feedback(mavlink_channel_t chan) {} +void AP_Camera::take_picture() {} +namespace AP { + AP_Camera *camera() { + return nullptr; + } +}; + /* end dummy methods to avoid having to link against AP_Camera */ // dummy method to avoid linking AFS