diff --git a/AntennaTracker/AP_Arming.h b/AntennaTracker/AP_Arming.h new file mode 100644 index 0000000000..fc8948cfda --- /dev/null +++ b/AntennaTracker/AP_Arming.h @@ -0,0 +1,14 @@ +#pragma once + +#include + +// this class isn't actually used by Tracker; it's really just here so +// the singleton doesn't come back as nullptr +class AP_Arming_Tracker : public AP_Arming +{ +public: + friend class Tracker; + +private: + +}; diff --git a/AntennaTracker/Tracker.h b/AntennaTracker/Tracker.h index 90c39ac1be..2dbf8f3a97 100644 --- a/AntennaTracker/Tracker.h +++ b/AntennaTracker/Tracker.h @@ -52,6 +52,8 @@ #include "GCS_Mavlink.h" #include "GCS_Tracker.h" +#include "AP_Arming.h" + #ifdef ENABLE_SCRIPTING #include #endif @@ -230,6 +232,9 @@ private: void tracking_manual_control(const mavlink_manual_control_t &msg); void update_armed_disarmed(); + // Arming/Disarming management class + AP_Arming_Tracker arming; + // Mission library AP_Mission mission{ FUNCTOR_BIND_MEMBER(&Tracker::start_command_callback, bool, const AP_Mission::Mission_Command &),