diff --git a/AntennaTracker/Tracker.h b/AntennaTracker/Tracker.h index 31d08b0b2b..1fb6d64ada 100644 --- a/AntennaTracker/Tracker.h +++ b/AntennaTracker/Tracker.h @@ -52,13 +52,9 @@ #include #include #include // statistics library -#include // Notify library #include // Battery monitor library #include -#include -#include #include -#include #include #include @@ -99,27 +95,14 @@ private: // main loop scheduler AP_Scheduler scheduler; - // notification object for LEDs, buzzers etc - AP_Notify notify; - uint32_t start_time_ms = 0; AP_Logger logger; - AP_GPS gps; - - AP_Baro barometer; - - Compass compass; - - AP_InertialSensor ins; - - RangeFinder rng; - // Inertial Navigation EKF #if AP_AHRS_NAVEKF_AVAILABLE - NavEKF2 EKF2{&ahrs, rng}; - NavEKF3 EKF3{&ahrs, rng}; + NavEKF2 EKF2{&ahrs, rangefinder}; + NavEKF3 EKF3{&ahrs, rangefinder}; AP_AHRS_NavEKF ahrs{EKF2, EKF3}; #else AP_AHRS_DCM ahrs; @@ -141,24 +124,15 @@ private: bool yaw_servo_out_filt_init = false; bool pitch_servo_out_filt_init = false; - AP_SerialManager serial_manager; GCS_Tracker _gcs; // avoid using this; use gcs() GCS_Tracker &gcs() { return _gcs; } AP_Stats stats; - AP_BoardConfig BoardConfig; - -#if HAL_WITH_UAVCAN - // board specific config for CAN bus - AP_BoardConfig_CAN BoardConfig_CAN; -#endif - // Battery Sensors AP_BattMonitor battery{MASK_LOG_CURRENT, FUNCTOR_BIND_MEMBER(&Tracker::handle_battery_failsafe, void, const char*, const int8_t), nullptr}; - struct Location current_loc; enum ControlMode control_mode = INITIALISING; @@ -297,5 +271,4 @@ public: void mavlink_delay_cb(); }; -extern const AP_HAL::HAL& hal; extern Tracker tracker;