fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-19 11:13:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/ROS_shared_lib_base_class' into dev_ros_rossharedlib

Browse Source 
Conflicts:
	src/modules/uORB/topics/vehicle_attitude.h
	src/platforms/px4_defines.h
This commit is contained in:
Thomas Gubler
2014-12-02 16:52:38 +01:00
parent 05a87a706a efe0938e99
commit ad499a5944
22 changed files with 1271 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/uORB/topics/actuator_armed.h
+1 -1
View File
@@ -42,7 +42,7 @@
#define TOPIC_ACTUATOR_ARMED_H
#include <stdint.h>
#include "../uORB.h"
#include <platforms/px4_defines.h>
/**
* @addtogroup topics
src/modules/uORB/topics/actuator_controls.h
+1 -1
View File
@@ -47,7 +47,7 @@
#define TOPIC_ACTUATOR_CONTROLS_H
#include <stdint.h>
#include "../uORB.h"
#include <platforms/px4_defines.h>
#define NUM_ACTUATOR_CONTROLS 8
#define NUM_ACTUATOR_CONTROL_GROUPS 4 /**< for sanity checking */
src/modules/uORB/topics/airspeed.h
+1 -1
View File
@@ -40,7 +40,7 @@
#ifndef TOPIC_AIRSPEED_H_
#define TOPIC_AIRSPEED_H_
#include "../uORB.h"
#include <platforms/px4_defines.h>
#include <stdint.h>
/**
src/modules/uORB/topics/fence.h
+1 -1
View File
@@ -42,7 +42,7 @@
#include <stdint.h>
#include <stdbool.h>
#include "../uORB.h"
#include <platforms/px4_defines.h>
/**
* @addtogroup topics
src/modules/uORB/topics/manual_control_setpoint.h
+1 -1
View File
@@ -41,7 +41,7 @@
#define TOPIC_MANUAL_CONTROL_SETPOINT_H_
#include <stdint.h>
#include "../uORB.h"
#include <platforms/px4_defines.h>
/**
* Switch position
src/modules/uORB/topics/parameter_update.h
+1 -1
View File
@@ -40,7 +40,7 @@
#define TOPIC_PARAMETER_UPDATE_H
#include <stdint.h>
#include "../uORB.h"
#include <platforms/px4_defines.h>
/**
* @addtogroup topics
src/modules/uORB/topics/vehicle_attitude_setpoint.h
+1 -1
View File
@@ -42,7 +42,7 @@
#include <stdint.h>
#include <stdbool.h>
#include "../uORB.h"
#include <platforms/px4_defines.h>
/**
* @addtogroup topics
src/modules/uORB/topics/vehicle_control_mode.h
+1 -1
View File
@@ -48,7 +48,7 @@
#include <stdint.h>
#include <stdbool.h>
#include "../uORB.h"
#include <platforms/px4_defines.h>
#include "vehicle_status.h"
/**
src/modules/uORB/topics/vehicle_global_position.h
+1 -1
View File
@@ -45,7 +45,7 @@
#include <stdint.h>
#include <stdbool.h>
#include "../uORB.h"
#include <platforms/px4_defines.h>
/**
* @addtogroup topics
src/modules/uORB/topics/vehicle_rates_setpoint.h
+1 -1
View File
@@ -41,7 +41,7 @@
#define TOPIC_VEHICLE_RATES_SETPOINT_H_
#include <stdint.h>
#include "../uORB.h"
#include <platforms/px4_defines.h>
/**
* @addtogroup topics
src/modules/uORB/topics/vehicle_status.h
+1 -1
View File
@@ -53,7 +53,7 @@
#include <stdint.h>
#include <stdbool.h>
#include "../uORB.h"
#include <platforms/px4_defines.h>
/**
* @addtogroup topics @{