Browse Source

Rover: compatibility with revised AP_Frsky_Telem class

master
floaledm 9 years ago committed by Andrew Tridgell
parent
commit
b5f75459f2
  1. 3
      APMrover2/Rover.cpp
  2. 2
      APMrover2/Rover.h
  3. 1
      APMrover2/make.inc
  4. 1
      APMrover2/wscript

3
APMrover2/Rover.cpp

@ -47,7 +47,8 @@ Rover::Rover(void) : @@ -47,7 +47,8 @@ Rover::Rover(void) :
ground_start_count(20),
throttle(500),
#if FRSKY_TELEM_ENABLED == ENABLED
frsky_telemetry(ahrs, battery),
inertial_nav(ahrs),
frsky_telemetry(ahrs, battery, sonar, inertial_nav),
#endif
home(ahrs.get_home()),
G_Dt(0.02)

2
APMrover2/Rover.h

@ -287,6 +287,8 @@ private: @@ -287,6 +287,8 @@ private:
AP_BattMonitor battery;
#if FRSKY_TELEM_ENABLED == ENABLED
// Inertial Navigation
AP_InertialNav_NavEKF inertial_nav;
// FrSky telemetry support
AP_Frsky_Telem frsky_telemetry;
#endif

1
APMrover2/make.inc

@ -38,6 +38,7 @@ LIBRARIES += AP_Navigation @@ -38,6 +38,7 @@ LIBRARIES += AP_Navigation
LIBRARIES += APM_Control
LIBRARIES += AP_L1_Control
LIBRARIES += AP_BoardConfig
LIBRARIES += AP_InertialNav
LIBRARIES += AP_Frsky_Telem
LIBRARIES += AP_Notify
LIBRARIES += AP_BattMonitor

1
APMrover2/wscript

@ -10,6 +10,7 @@ def build(bld): @@ -10,6 +10,7 @@ def build(bld):
'APM_Control',
'AP_Arming',
'AP_Camera',
'AP_InertialNav',
'AP_Frsky_Telem',
'AP_L1_Control',
'AP_Menu',

Loading…
Cancel
Save