From 3fb73d7e93e0121e6adb9f9047f710f32e5ddc1d Mon Sep 17 00:00:00 2001 From: Pierre Kancir Date: Tue, 26 Jan 2021 12:37:55 +0100 Subject: [PATCH] Copter: move SmartRTLState to SmartRTL class --- ArduCopter/defines.h | 9 --------- ArduCopter/mode.h | 9 +++++++++ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ArduCopter/defines.h b/ArduCopter/defines.h index a7f2ae1470..646cdb2da3 100644 --- a/ArduCopter/defines.h +++ b/ArduCopter/defines.h @@ -91,15 +91,6 @@ enum class AirMode { AIRMODE_ENABLED, }; -// Safe RTL states -enum class SmartRTLState : uint8_t { - WAIT_FOR_PATH_CLEANUP, - PATH_FOLLOW, - PRELAND_POSITION, - DESCEND, - LAND -}; - enum PayloadPlaceStateType { PayloadPlaceStateType_FlyToLocation, PayloadPlaceStateType_Calibrating_Hover_Start, diff --git a/ArduCopter/mode.h b/ArduCopter/mode.h index a91947866f..f3066b1833 100644 --- a/ArduCopter/mode.h +++ b/ArduCopter/mode.h @@ -1237,6 +1237,15 @@ public: bool is_landing() const override; + // Safe RTL states + enum class SmartRTLState : uint8_t { + WAIT_FOR_PATH_CLEANUP, + PATH_FOLLOW, + PRELAND_POSITION, + DESCEND, + LAND + }; + protected: const char *name() const override { return "SMARTRTL"; }