diff --git a/apps/fixedwing_control/fixedwing_control.zip b/apps/fixedwing_control/fixedwing_control.zip deleted file mode 100644 index edaac33d5b..0000000000 Binary files a/apps/fixedwing_control/fixedwing_control.zip and /dev/null differ diff --git a/apps/uORB/objects_common.cpp b/apps/uORB/objects_common.cpp index e40199e97e..1cad57a436 100644 --- a/apps/uORB/objects_common.cpp +++ b/apps/uORB/objects_common.cpp @@ -78,18 +78,12 @@ ORB_DEFINE(vehicle_global_position, struct vehicle_global_position_s); #include "topics/vehicle_local_position.h" ORB_DEFINE(vehicle_local_position, struct vehicle_local_position_s); -#include "topics/ardrone_control.h" -ORB_DEFINE(ardrone_control, struct ardrone_control_s); - #include "topics/ardrone_motors_setpoint.h" ORB_DEFINE(ardrone_motors_setpoint, struct ardrone_motors_setpoint_s); #include "topics/rc_channels.h" ORB_DEFINE(rc_channels, struct rc_channels_s); -#include "topics/fixedwing_control.h" -ORB_DEFINE(fixedwing_control, struct fixedwing_control_s); - #include "topics/vehicle_command.h" ORB_DEFINE(vehicle_command, struct vehicle_command_s); diff --git a/apps/uORB/topics/ardrone_control.h b/apps/uORB/topics/ardrone_control.h deleted file mode 100644 index 1f582f52ac..0000000000 --- a/apps/uORB/topics/ardrone_control.h +++ /dev/null @@ -1,83 +0,0 @@ -/**************************************************************************** - * - * Copyright (C) 2012 PX4 Development Team. All rights reserved. - * Author: @author Thomas Gubler - * @author Julian Oes - * @author Lorenz Meier - * - * 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 ardrone_control.c - * Definition of the ardrone_control uORB topic. - */ - -#ifndef TOPIC_ARDRONE_CONTROL_H_ -#define TOPIC_ARDRONE_CONTROL_H_ - -#include -#include "../uORB.h" - -/** - * @addtogroup topics - * @{ - */ - -struct ardrone_control_s -{ - uint16_t counter; /**< incremented by the publishing thread everytime new data is stored. */ - uint64_t timestamp; /**< in microseconds since system start, is set whenever the writing thread stores new data. */ - - float setpoint_rate_cast[3]; - float setpoint_thrust_cast; /**< LOGME */ - float setpoint_attitude_rate[3]; - float setpoint_attitude[3]; /**< LOGME */ - float attitude_control_output[3]; /**< roll, pitch, yaw. */ - float position_control_output[3]; /**< x, y, z. */ - float attitude_setpoint_navigationframe_from_positioncontroller[3]; /**< LOGME */ - float gyro_scaled[3]; - float gyro_filtered[3]; - float gyro_filtered_offset[3]; - float zcompensation; - uint16_t motor_front_nw; - uint16_t motor_right_ne; - uint16_t motor_back_se; - uint16_t motor_left_sw; - -}; /**< ardrone control status */ - -/** - * @} - */ - -/* register this as object request broker structure */ -ORB_DECLARE(ardrone_control); - -#endif /* TOPIC_ARDRONE_CONTROL_H_ */ diff --git a/apps/uORB/topics/fixedwing_control.h b/apps/uORB/topics/fixedwing_control.h deleted file mode 100644 index 5f70cad40b..0000000000 --- a/apps/uORB/topics/fixedwing_control.h +++ /dev/null @@ -1,77 +0,0 @@ -/**************************************************************************** - * - * Copyright (C) 2012 PX4 Development Team. All rights reserved. - * Author: @author Lorenz Meier - * - * - * 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 fixedwing_control.h - * Definition of the fixedwing_control uORB topic. - */ - -#ifndef TOPIC_FIXEDWING_CONTROL_H_ -#define TOPIC_FIXEDWING_CONTROL_H_ - -#include -#include "../uORB.h" - -/** - * @addtogroup topics - * @{ - */ - -/** - * fixed wing control status. - */ -struct fixedwing_control_s -{ - /* use of a counter and timestamp recommended (but not necessary) */ - - uint16_t counter; //incremented by the writing thread everytime new data is stored - uint64_t timestamp; //in microseconds since system start, is set whenever the writing thread stores new data - - float setpoint_rate_cast[3]; - float setpoint_attitude_rate[3]; - float setpoint_attitude[3]; - float attitude_control_output[4]; /**< roll, pitch, yaw, throttle */ - float position_control_output[4]; - -}; - -/** - * @} - */ - -/* register this as object request broker structure */ -ORB_DECLARE(fixedwing_control); - -#endif //GLOBAL_DATA_FIXEDWING_CONTROL_T_H_