From 363a4821656d5fd8afef2887150f6ee705074af5 Mon Sep 17 00:00:00 2001 From: Lorenz Meier Date: Fri, 5 Jun 2015 10:14:58 +0200 Subject: [PATCH] Move navigation_capabilities uORB topic to generated message set --- msg/navigation_capabilities.msg | 5 ++ .../uORB/topics/navigation_capabilities.h | 70 ------------------- 2 files changed, 5 insertions(+), 70 deletions(-) create mode 100644 msg/navigation_capabilities.msg delete mode 100644 src/modules/uORB/topics/navigation_capabilities.h diff --git a/msg/navigation_capabilities.msg b/msg/navigation_capabilities.msg new file mode 100644 index 0000000000..235b5df03b --- /dev/null +++ b/msg/navigation_capabilities.msg @@ -0,0 +1,5 @@ +uint64 timestamp # timestamp this topic was emitted +float32 turn_distance # the optimal distance to a waypoint to switch to the next +float32 landing_horizontal_slope_displacement +float32 landing_slope_angle_rad +float32 landing_flare_length diff --git a/src/modules/uORB/topics/navigation_capabilities.h b/src/modules/uORB/topics/navigation_capabilities.h deleted file mode 100644 index 7a5ae98914..0000000000 --- a/src/modules/uORB/topics/navigation_capabilities.h +++ /dev/null @@ -1,70 +0,0 @@ -/**************************************************************************** - * - * Copyright (C) 2012-2013 PX4 Development Team. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * 3. Neither the name PX4 nor the names of its contributors may be - * used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - * - ****************************************************************************/ - -/** - * @file navigation_capabilities.h - * - * Definition of navigation capabilities uORB topic. - */ - -#ifndef TOPIC_NAVIGATION_CAPABILITIES_H_ -#define TOPIC_NAVIGATION_CAPABILITIES_H_ - -#include "../uORB.h" -#include - -/** - * @addtogroup topics - * @{ - */ - -/** - * Airspeed - */ -struct navigation_capabilities_s { - float turn_distance; /**< the optimal distance to a waypoint to switch to the next */ - - /* Landing parameters: see fw_pos_control_l1/landingslope.h */ - float landing_horizontal_slope_displacement; - float landing_slope_angle_rad; - float landing_flare_length; -}; - -/** - * @} - */ - -/* register this as object request broker structure */ -ORB_DECLARE(navigation_capabilities); - -#endif