Merge pull request #2977 from dagar/rattitude

PX4_CUSTOM_MAIN_MODE consistency

Merge pull request #2977 from dagar/rattitude
PX4_CUSTOM_MAIN_MODE consistency
853fd725 · Don Gagne · cd39a194 · 12aa4679 · 853fd725 · 853fd725
Commit 853fd725 authored Mar 09, 2016 by Don Gagne
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

PX4AutoPilotPlugin.cc src/AutoPilotPlugins/PX4/PX4AutoPilotPlugin.cc +2 -0

MockLink.cc src/comm/MockLink.cc +2 -0

No files found.
--- a/src/AutoPilotPlugins/PX4/PX4AutoPilotPlugin.cc
+++ b/src/AutoPilotPlugins/PX4/PX4AutoPilotPlugin.cc
@@ -43,6 +43,8 @@ enum PX4_CUSTOM_MAIN_MODE {
    PX4_CUSTOM_MAIN_MODE_ACRO,
    PX4_CUSTOM_MAIN_MODE_OFFBOARD,
    PX4_CUSTOM_MAIN_MODE_STABILIZED,
+    PX4_CUSTOM_MAIN_MODE_RATTITUDE
+    
 };

 enum PX4_CUSTOM_SUB_MODE_AUTO {

--- a/src/comm/MockLink.cc
+++ b/src/comm/MockLink.cc
@@ -46,6 +46,8 @@ enum PX4_CUSTOM_MAIN_MODE {
    PX4_CUSTOM_MAIN_MODE_AUTO,
    PX4_CUSTOM_MAIN_MODE_ACRO,
    PX4_CUSTOM_MAIN_MODE_OFFBOARD,
+    PX4_CUSTOM_MAIN_MODE_STABILIZED,
+    PX4_CUSTOM_MAIN_MODE_RATTITUDE
 };

 enum PX4_CUSTOM_SUB_MODE_AUTO {