From ff249788bf9dac7dcd6e477e3073d384848533af Mon Sep 17 00:00:00 2001 From: Tom Pittenger Date: Thu, 3 Mar 2016 09:10:45 -0800 Subject: [PATCH] Plane: add a default Navigation option as explained in the param docs --- ArduPlane/navigation.cpp | 5 +++++ libraries/AP_Navigation/AP_Navigation.h | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ArduPlane/navigation.cpp b/ArduPlane/navigation.cpp index 4f9e2dc1f0..0a1a674c9c 100644 --- a/ArduPlane/navigation.cpp +++ b/ArduPlane/navigation.cpp @@ -6,6 +6,11 @@ void Plane::set_nav_controller(void) { switch ((AP_Navigation::ControllerType)g.nav_controller.get()) { + + default: + case AP_Navigation::CONTROLLER_DEFAULT: + // fall through to L1 as default controller + case AP_Navigation::CONTROLLER_L1: nav_controller = &L1_controller; break; diff --git a/libraries/AP_Navigation/AP_Navigation.h b/libraries/AP_Navigation/AP_Navigation.h index c107f0d676..5a6d7cfaff 100644 --- a/libraries/AP_Navigation/AP_Navigation.h +++ b/libraries/AP_Navigation/AP_Navigation.h @@ -106,7 +106,8 @@ public: // select which navigation controller to use by setting the // NAV_CONTROLLER parameter enum ControllerType { - CONTROLLER_L1 = 1 + CONTROLLER_DEFAULT = 0, + CONTROLLER_L1 = 1 }; };