diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2014-06-29 19:12:35 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-06-29 19:12:35 +0200 |
| commit | ecee13861c498929c5c014ec8ba7744a76a01c64 (patch) | |
| tree | db18adb09d8f35121e41374fc42d6e2cb3a29a89 /src/modules/uORB | |
| parent | 164f19176e1eb0d5546a5a1b00392917e9a7b87c (diff) | |
| parent | 94c69e11ae1ec44c80eec1c979201c7d7e51cdb0 (diff) | |
| download | px4-firmware-ecee13861c498929c5c014ec8ba7744a76a01c64.tar.gz px4-firmware-ecee13861c498929c5c014ec8ba7744a76a01c64.tar.bz2 px4-firmware-ecee13861c498929c5c014ec8ba7744a76a01c64.zip | |
Merged master
Diffstat (limited to 'src/modules/uORB')
| -rw-r--r-- | src/modules/uORB/topics/mission.h | 1 | ||||
| -rw-r--r-- | src/modules/uORB/topics/tecs_status.h | 1 | ||||
| -rw-r--r-- | src/modules/uORB/topics/vehicle_attitude_setpoint.h | 2 |
3 files changed, 4 insertions, 0 deletions
diff --git a/src/modules/uORB/topics/mission.h b/src/modules/uORB/topics/mission.h index 499b2e1e5..e4b72f87c 100644 --- a/src/modules/uORB/topics/mission.h +++ b/src/modules/uORB/topics/mission.h @@ -50,6 +50,7 @@ /* compatible to mavlink MAV_CMD */ enum NAV_CMD { + NAV_CMD_IDLE=0, NAV_CMD_WAYPOINT=16, NAV_CMD_LOITER_UNLIMITED=17, NAV_CMD_LOITER_TURN_COUNT=18, diff --git a/src/modules/uORB/topics/tecs_status.h b/src/modules/uORB/topics/tecs_status.h index 05310e906..c4d0c1874 100644 --- a/src/modules/uORB/topics/tecs_status.h +++ b/src/modules/uORB/topics/tecs_status.h @@ -68,6 +68,7 @@ struct tecs_status_s { float altitude; float flightPathAngleSp; float flightPathAngle; + float flightPathAngleFiltered; float airspeedSp; float airspeed; float airspeedFiltered; diff --git a/src/modules/uORB/topics/vehicle_attitude_setpoint.h b/src/modules/uORB/topics/vehicle_attitude_setpoint.h index d526a8ff2..8446e9c6e 100644 --- a/src/modules/uORB/topics/vehicle_attitude_setpoint.h +++ b/src/modules/uORB/topics/vehicle_attitude_setpoint.h @@ -72,6 +72,8 @@ struct vehicle_attitude_setpoint_s { float thrust; /**< Thrust in Newton the power system should generate */ bool roll_reset_integral; /**< Reset roll integral part (navigation logic change) */ + bool pitch_reset_integral; /**< Reset pitch integral part (navigation logic change) */ + bool yaw_reset_integral; /**< Reset yaw integral part (navigation logic change) */ }; |