aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rover: compatibility with revised AP_Frsky_Telem class

Browse Source
This commit is contained in:
floaledm 2016-05-03 16:32:24 -05:00 committed by Andrew Tridgell
parent 50eecf58a4
commit b5f75459f2
4 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
APMrover2/Rover.cpp
View File

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

2
APMrover2/Rover.h
View File

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

1
APMrover2/make.inc
View File

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

1
APMrover2/wscript
View File

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