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

Rover: correct compilation when AFS enabled

Browse Source
This commit is contained in:
Peter Barker 2019-08-21 11:21:49 +10:00 committed by Randy Mackay
parent 3c6b67349f
commit a0ba9986a2
4 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
APMrover2/Parameters.cpp
View File

@ -663,7 +663,7 @@ const AP_Param::GroupInfo ParametersG2::var_info[] = {
ParametersG2::ParametersG2(void) ParametersG2::ParametersG2(void)
: :
#if ADVANCED_FAILSAFE == ENABLED #if ADVANCED_FAILSAFE == ENABLED
afs(rover.mission, rover.gps), afs(rover.mode_auto.mission),
#endif #endif
beacon(rover.serial_manager), beacon(rover.serial_manager),
motors(rover.ServoRelayEvents), motors(rover.ServoRelayEvents),

6
APMrover2/afs_rover.cpp
View File

@ -6,12 +6,6 @@
#if ADVANCED_FAILSAFE == ENABLED #if ADVANCED_FAILSAFE == ENABLED
// Constructor
AP_AdvancedFailsafe_Rover::AP_AdvancedFailsafe_Rover(AP_Mission &_mission, const AP_GPS &_gps) :
AP_AdvancedFailsafe(_mission, _gps)
{}
/* /*
Setup radio_out values for all channels to termination values Setup radio_out values for all channels to termination values
*/ */

2
APMrover2/afs_rover.h
View File

@ -27,7 +27,7 @@
class AP_AdvancedFailsafe_Rover : public AP_AdvancedFailsafe class AP_AdvancedFailsafe_Rover : public AP_AdvancedFailsafe
{ {
public: public:
AP_AdvancedFailsafe_Rover(AP_Mission &_mission, const AP_GPS &_gps); using AP_AdvancedFailsafe::AP_AdvancedFailsafe;
// called to set all outputs to termination state // called to set all outputs to termination state
void terminate_vehicle(void) override; void terminate_vehicle(void) override;

2
APMrover2/failsafe.cpp
View File

@ -5,6 +5,8 @@
#include "Rover.h" #include "Rover.h"
#include <stdio.h>
/* /*
our failsafe strategy is to detect main loop lockup and switch to our failsafe strategy is to detect main loop lockup and switch to
passing inputs straight from the RC inputs to RC outputs. passing inputs straight from the RC inputs to RC outputs.