Rover: integrate AR_WPNav_OA

This commit is contained in:
Randy Mackay 2021-11-22 13:38:20 +09:00
parent 74889f1c7a
commit 34447fa7a8
4 changed files with 4 additions and 4 deletions

View File

@ -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

View File

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

View File

@ -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

View File

@ -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"