diff options
| author | Julian Oes <julian@oes.ch> | 2013-11-20 12:46:25 +0100 |
|---|---|---|
| committer | Julian Oes <julian@oes.ch> | 2013-11-20 12:46:25 +0100 |
| commit | a6c5a1920639f3ff1b2d1a0cea6eeacf6676fc76 (patch) | |
| tree | fee81d0851cd5ce46400c80115d892ed7ffc4f50 /src/modules/uORB/topics | |
| parent | a9e51105c81a4de0cf35a03af0be67fb49ba8870 (diff) | |
| download | px4-firmware-a6c5a1920639f3ff1b2d1a0cea6eeacf6676fc76.tar.gz px4-firmware-a6c5a1920639f3ff1b2d1a0cea6eeacf6676fc76.tar.bz2 px4-firmware-a6c5a1920639f3ff1b2d1a0cea6eeacf6676fc76.zip | |
Mission topic: Use mission topic instead of global position for triplet
Diffstat (limited to 'src/modules/uORB/topics')
| -rw-r--r-- | src/modules/uORB/topics/mission_item_triplet.h (renamed from src/modules/uORB/topics/vehicle_global_position_set_triplet.h) | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/src/modules/uORB/topics/vehicle_global_position_set_triplet.h b/src/modules/uORB/topics/mission_item_triplet.h index 8516b263f..48553b0ac 100644 --- a/src/modules/uORB/topics/vehicle_global_position_set_triplet.h +++ b/src/modules/uORB/topics/mission_item_triplet.h @@ -1,6 +1,6 @@ /**************************************************************************** * - * Copyright (C) 2012 PX4 Development Team. All rights reserved. + * Copyright (C) 2013 PX4 Development Team. All rights reserved. * Author: @author Thomas Gubler <thomasgubler@student.ethz.ch> * @author Julian Oes <joes@student.ethz.ch> * @author Lorenz Meier <lm@inf.ethz.ch> @@ -35,18 +35,18 @@ ****************************************************************************/ /** - * @file vehicle_global_position_setpoint.h + * @file mission_item_triplet.h * Definition of the global WGS84 position setpoint uORB topic. */ -#ifndef TOPIC_VEHICLE_GLOBAL_POSITION_SET_TRIPLET_H_ -#define TOPIC_VEHICLE_GLOBAL_POSITION_SET_TRIPLET_H_ +#ifndef TOPIC_MISSION_ITEM_TRIPLET_H_ +#define TOPIC_MISSION_ITEM_TRIPLET_H_ #include <stdint.h> #include <stdbool.h> #include "../uORB.h" -#include "vehicle_global_position_setpoint.h" +#include "mission.h" /** * @addtogroup topics @@ -58,14 +58,15 @@ * * This are the three next waypoints (or just the next two or one). */ -struct vehicle_global_position_set_triplet_s +struct mission_item_triplet_s { - bool previous_valid; /**< flag indicating previous position is valid */ - bool next_valid; /**< flag indicating next position is valid */ + bool previous_valid; + bool current_valid; /**< flag indicating previous mission item is valid */ + bool next_valid; /**< flag indicating next mission item is valid */ - struct vehicle_global_position_setpoint_s previous; - struct vehicle_global_position_setpoint_s current; - struct vehicle_global_position_setpoint_s next; + struct mission_item_s previous; + struct mission_item_s current; + struct mission_item_s next; }; /** @@ -73,6 +74,6 @@ struct vehicle_global_position_set_triplet_s */ /* register this as object request broker structure */ -ORB_DECLARE(vehicle_global_position_set_triplet); +ORB_DECLARE(mission_item_triplet); #endif |