diff options
author | Thomas Gubler <thomasgubler@gmail.com> | 2014-12-02 16:52:38 +0100 |
---|---|---|
committer | Thomas Gubler <thomasgubler@gmail.com> | 2014-12-02 16:52:38 +0100 |
commit | ad499a594447d807b3702c64fdfaad51ac579e2b (patch) | |
tree | 73c3a2b96b488a246407f9a377b6bac5830965c4 /src/modules/uORB/topics | |
parent | 05a87a706a122b8a83becaaa94c70161fb69c82a (diff) | |
parent | efe0938e9990225636e5fed78e945ded5f24220f (diff) | |
download | px4-firmware-ad499a594447d807b3702c64fdfaad51ac579e2b.tar.gz px4-firmware-ad499a594447d807b3702c64fdfaad51ac579e2b.tar.bz2 px4-firmware-ad499a594447d807b3702c64fdfaad51ac579e2b.zip |
Merge remote-tracking branch 'upstream/ROS_shared_lib_base_class' into dev_ros_rossharedlib
Conflicts:
src/modules/uORB/topics/vehicle_attitude.h
src/platforms/px4_defines.h
Diffstat (limited to 'src/modules/uORB/topics')
-rw-r--r-- | src/modules/uORB/topics/actuator_armed.h | 2 | ||||
-rw-r--r-- | src/modules/uORB/topics/actuator_controls.h | 2 | ||||
-rw-r--r-- | src/modules/uORB/topics/airspeed.h | 2 | ||||
-rw-r--r-- | src/modules/uORB/topics/fence.h | 2 | ||||
-rw-r--r-- | src/modules/uORB/topics/manual_control_setpoint.h | 2 | ||||
-rw-r--r-- | src/modules/uORB/topics/parameter_update.h | 2 | ||||
-rw-r--r-- | src/modules/uORB/topics/vehicle_attitude_setpoint.h | 2 | ||||
-rw-r--r-- | src/modules/uORB/topics/vehicle_control_mode.h | 2 | ||||
-rw-r--r-- | src/modules/uORB/topics/vehicle_global_position.h | 2 | ||||
-rw-r--r-- | src/modules/uORB/topics/vehicle_rates_setpoint.h | 2 | ||||
-rw-r--r-- | src/modules/uORB/topics/vehicle_status.h | 2 |
11 files changed, 11 insertions, 11 deletions
diff --git a/src/modules/uORB/topics/actuator_armed.h b/src/modules/uORB/topics/actuator_armed.h index 0f6c9aca1..1e10e0ad1 100644 --- a/src/modules/uORB/topics/actuator_armed.h +++ b/src/modules/uORB/topics/actuator_armed.h @@ -42,7 +42,7 @@ #define TOPIC_ACTUATOR_ARMED_H #include <stdint.h> -#include "../uORB.h" +#include <platforms/px4_defines.h> /** * @addtogroup topics diff --git a/src/modules/uORB/topics/actuator_controls.h b/src/modules/uORB/topics/actuator_controls.h index e768ab2f6..43f7a59ee 100644 --- a/src/modules/uORB/topics/actuator_controls.h +++ b/src/modules/uORB/topics/actuator_controls.h @@ -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 */ diff --git a/src/modules/uORB/topics/airspeed.h b/src/modules/uORB/topics/airspeed.h index d2ee754cd..676c37c77 100644 --- a/src/modules/uORB/topics/airspeed.h +++ b/src/modules/uORB/topics/airspeed.h @@ -40,7 +40,7 @@ #ifndef TOPIC_AIRSPEED_H_ #define TOPIC_AIRSPEED_H_ -#include "../uORB.h" +#include <platforms/px4_defines.h> #include <stdint.h> /** diff --git a/src/modules/uORB/topics/fence.h b/src/modules/uORB/topics/fence.h index 6f16c51cf..a61f078ba 100644 --- a/src/modules/uORB/topics/fence.h +++ b/src/modules/uORB/topics/fence.h @@ -42,7 +42,7 @@ #include <stdint.h> #include <stdbool.h> -#include "../uORB.h" +#include <platforms/px4_defines.h> /** * @addtogroup topics diff --git a/src/modules/uORB/topics/manual_control_setpoint.h b/src/modules/uORB/topics/manual_control_setpoint.h index 50b7bd9e5..13138ebc9 100644 --- a/src/modules/uORB/topics/manual_control_setpoint.h +++ b/src/modules/uORB/topics/manual_control_setpoint.h @@ -41,7 +41,7 @@ #define TOPIC_MANUAL_CONTROL_SETPOINT_H_ #include <stdint.h> -#include "../uORB.h" +#include <platforms/px4_defines.h> /** * Switch position diff --git a/src/modules/uORB/topics/parameter_update.h b/src/modules/uORB/topics/parameter_update.h index 68964deb0..fe9c9070f 100644 --- a/src/modules/uORB/topics/parameter_update.h +++ b/src/modules/uORB/topics/parameter_update.h @@ -40,7 +40,7 @@ #define TOPIC_PARAMETER_UPDATE_H #include <stdint.h> -#include "../uORB.h" +#include <platforms/px4_defines.h> /** * @addtogroup topics diff --git a/src/modules/uORB/topics/vehicle_attitude_setpoint.h b/src/modules/uORB/topics/vehicle_attitude_setpoint.h index 8446e9c6e..a503aa0c6 100644 --- a/src/modules/uORB/topics/vehicle_attitude_setpoint.h +++ b/src/modules/uORB/topics/vehicle_attitude_setpoint.h @@ -42,7 +42,7 @@ #include <stdint.h> #include <stdbool.h> -#include "../uORB.h" +#include <platforms/px4_defines.h> /** * @addtogroup topics diff --git a/src/modules/uORB/topics/vehicle_control_mode.h b/src/modules/uORB/topics/vehicle_control_mode.h index ca7705456..2dd8550bc 100644 --- a/src/modules/uORB/topics/vehicle_control_mode.h +++ b/src/modules/uORB/topics/vehicle_control_mode.h @@ -48,7 +48,7 @@ #include <stdint.h> #include <stdbool.h> -#include "../uORB.h" +#include <platforms/px4_defines.h> #include "vehicle_status.h" /** diff --git a/src/modules/uORB/topics/vehicle_global_position.h b/src/modules/uORB/topics/vehicle_global_position.h index c3bb3b893..f7a432495 100644 --- a/src/modules/uORB/topics/vehicle_global_position.h +++ b/src/modules/uORB/topics/vehicle_global_position.h @@ -45,7 +45,7 @@ #include <stdint.h> #include <stdbool.h> -#include "../uORB.h" +#include <platforms/px4_defines.h> /** * @addtogroup topics diff --git a/src/modules/uORB/topics/vehicle_rates_setpoint.h b/src/modules/uORB/topics/vehicle_rates_setpoint.h index 9f8b412a7..e5cecf02b 100644 --- a/src/modules/uORB/topics/vehicle_rates_setpoint.h +++ b/src/modules/uORB/topics/vehicle_rates_setpoint.h @@ -41,7 +41,7 @@ #define TOPIC_VEHICLE_RATES_SETPOINT_H_ #include <stdint.h> -#include "../uORB.h" +#include <platforms/px4_defines.h> /** * @addtogroup topics diff --git a/src/modules/uORB/topics/vehicle_status.h b/src/modules/uORB/topics/vehicle_status.h index 8ec9d98d6..131029061 100644 --- a/src/modules/uORB/topics/vehicle_status.h +++ b/src/modules/uORB/topics/vehicle_status.h @@ -53,7 +53,7 @@ #include <stdint.h> #include <stdbool.h> -#include "../uORB.h" +#include <platforms/px4_defines.h> /** * @addtogroup topics @{ |