From 4e2bf27da6f0dbb88ac968bcf2621f29eb4f14a1 Mon Sep 17 00:00:00 2001
From: Daniel Agar <daniel@agar.ca>
Date: Fri, 9 Nov 2018 14:03:24 -0500
Subject: [PATCH] FlightTaskAuto set WaypointType from position setpoint types
---
.../FlightTasks/tasks/Auto/FlightTaskAuto.hpp | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/lib/FlightTasks/tasks/Auto/FlightTaskAuto.hpp b/src/lib/FlightTasks/tasks/Auto/FlightTaskAuto.hpp
index f90a8a3f83..7c7705804d 100644
--- a/src/lib/FlightTasks/tasks/Auto/FlightTaskAuto.hpp
+++ b/src/lib/FlightTasks/tasks/Auto/FlightTaskAuto.hpp
@@ -53,14 +53,14 @@
* of the size
*/
enum class WaypointType : int {
- position = 0,
- velocity,
- loiter,
- takeoff,
- land,
- idle,
- offboard, // only part of this structure due to legacy reason. It is not used within the Auto flighttasks
- follow_target
+ position = position_setpoint_s::SETPOINT_TYPE_POSITION,
+ velocity = position_setpoint_s::SETPOINT_TYPE_VELOCITY,
+ loiter = position_setpoint_s::SETPOINT_TYPE_LOITER,
+ takeoff = position_setpoint_s::SETPOINT_TYPE_TAKEOFF,
+ land = position_setpoint_s::SETPOINT_TYPE_LAND,
+ idle = position_setpoint_s::SETPOINT_TYPE_IDLE,
+ offboard = position_setpoint_s::SETPOINT_TYPE_OFFBOARD, // only part of this structure due to legacy reason. It is not used within the Auto flighttasks
+ follow_target = position_setpoint_s::SETPOINT_TYPE_FOLLOW_TARGET,
};
enum class State {
--
GitLab