Browse Source

AP_Mount: minor include and definition re-order and fixup

apm_2208
Randy Mackay 3 years ago committed by Andrew Tridgell
parent
commit
1400eba400
  1. 3
      libraries/AP_Mount/AP_Mount.cpp
  2. 2
      libraries/AP_Mount/AP_Mount_Backend.h

3
libraries/AP_Mount/AP_Mount.cpp

@ -12,6 +12,7 @@
#include "AP_Mount_SToRM32_serial.h" #include "AP_Mount_SToRM32_serial.h"
#include "AP_Mount_Gremsy.h" #include "AP_Mount_Gremsy.h"
#include <AP_Math/location.h> #include <AP_Math/location.h>
#include <SRV_Channel/SRV_Channel.h>
const AP_Param::GroupInfo AP_Mount::var_info[] = { const AP_Param::GroupInfo AP_Mount::var_info[] = {
@ -449,7 +450,7 @@ void AP_Mount::init()
#endif #endif
#if HAL_SOLO_GIMBAL_ENABLED #if HAL_SOLO_GIMBAL_ENABLED
// check for MAVLink mounts // check for Solo mounts
} else if (mount_type == Mount_Type_SoloGimbal) { } else if (mount_type == Mount_Type_SoloGimbal) {
_backends[instance] = new AP_Mount_SoloGimbal(*this, state[instance], instance); _backends[instance] = new AP_Mount_SoloGimbal(*this, state[instance], instance);
_num_instances++; _num_instances++;

2
libraries/AP_Mount/AP_Mount_Backend.h

@ -19,9 +19,9 @@
*/ */
#pragma once #pragma once
#include <AP_Common/AP_Common.h>
#include "AP_Mount.h" #include "AP_Mount.h"
#if HAL_MOUNT_ENABLED #if HAL_MOUNT_ENABLED
#include <AP_Common/AP_Common.h>
#include <RC_Channel/RC_Channel.h> #include <RC_Channel/RC_Channel.h>
class AP_Mount_Backend class AP_Mount_Backend

Loading…
Cancel
Save