Browse Source

Rover: integrate AR_WPNav_OA

apm_2208
Randy Mackay 3 years ago
parent
commit
34447fa7a8
  1. 2
      Rover/Parameters.cpp
  2. 2
      Rover/Parameters.h
  3. 2
      Rover/Rover.h
  4. 2
      Rover/mode.h

2
Rover/Parameters.cpp

@ -609,7 +609,7 @@ const AP_Param::GroupInfo ParametersG2::var_info[] = { @@ -609,7 +609,7 @@ const AP_Param::GroupInfo ParametersG2::var_info[] = {
// @Group: WP_
// @Path: ../libraries/AR_WPNav/AR_WPNav.cpp
AP_SUBGROUPINFO(wp_nav, "WP_", 43, ParametersG2, AR_WPNav),
AP_SUBGROUPINFO(wp_nav, "WP_", 43, ParametersG2, AR_WPNav_OA),
// @Group: SAIL_
// @Path: sailboat.cpp

2
Rover/Parameters.h

@ -385,7 +385,7 @@ public: @@ -385,7 +385,7 @@ public:
#endif // AP_SCRIPTING_ENABLED
// waypoint navigation
AR_WPNav wp_nav;
AR_WPNav_OA wp_nav;
// Sailboat functions
Sailboat sailboat;

2
Rover/Rover.h

@ -52,7 +52,7 @@ @@ -52,7 +52,7 @@
#include <AP_WheelEncoder/AP_WheelRateControl.h>
#include <APM_Control/AR_AttitudeControl.h>
#include <APM_Control/AR_PosControl.h>
#include <AR_WPNav/AR_WPNav.h>
#include <AR_WPNav/AR_WPNav_OA.h>
#include <AP_SmartRTL/AP_SmartRTL.h>
#include <AP_Logger/AP_Logger.h>
#include <Filter/AverageFilter.h> // Mode Filter from Filter library

2
Rover/mode.h

@ -6,7 +6,7 @@ @@ -6,7 +6,7 @@
#include <AP_Math/AP_Math.h>
#include <AP_Mission/AP_Mission.h>
#include <AP_Mission/AP_Mission_ChangeDetector.h>
#include <AR_WPNav/AR_WPNav.h>
#include <AR_WPNav/AR_WPNav_OA.h>
#include "defines.h"

Loading…
Cancel
Save