diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2014-08-11 10:33:11 +0200 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2014-08-11 10:33:11 +0200 |
| commit | 8bbaacb1e9381c29a83e0ecf37de6df3018bd38d (patch) | |
| tree | 712af7080cdb82c244018419c2af692b0a73bf04 /src/modules/uORB/topics/tecs_status.h | |
| parent | 7bc0e26734a0319295e488e413db8f618b9b621c (diff) | |
| parent | 5abdacc9079e4ebe5f2e3d855f3c5241adecef37 (diff) | |
| download | px4-firmware-8bbaacb1e9381c29a83e0ecf37de6df3018bd38d.tar.gz px4-firmware-8bbaacb1e9381c29a83e0ecf37de6df3018bd38d.tar.bz2 px4-firmware-8bbaacb1e9381c29a83e0ecf37de6df3018bd38d.zip | |
Merge remote-tracking branch 'upstream/master' into offboard2_externalsetpointmessages
Conflicts:
src/modules/mavlink/mavlink_main.cpp
src/modules/mavlink/mavlink_main.h
src/modules/mavlink/mavlink_receiver.cpp
Diffstat (limited to 'src/modules/uORB/topics/tecs_status.h')
| -rw-r--r-- | src/modules/uORB/topics/tecs_status.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/modules/uORB/topics/tecs_status.h b/src/modules/uORB/topics/tecs_status.h index 33055018c..ddca19d61 100644 --- a/src/modules/uORB/topics/tecs_status.h +++ b/src/modules/uORB/topics/tecs_status.h @@ -51,11 +51,13 @@ */ typedef enum { - TECS_MODE_NORMAL, + TECS_MODE_NORMAL = 0, TECS_MODE_UNDERSPEED, TECS_MODE_TAKEOFF, TECS_MODE_LAND, - TECS_MODE_LAND_THROTTLELIM + TECS_MODE_LAND_THROTTLELIM, + TECS_MODE_BAD_DESCENT, + TECS_MODE_CLIMBOUT } tecs_mode; /** @@ -65,14 +67,12 @@ struct tecs_status_s { uint64_t timestamp; /**< timestamp, in microseconds since system start */ float altitudeSp; - float altitude; - float altitudeFiltered; + float altitude_filtered; float flightPathAngleSp; float flightPathAngle; float flightPathAngleFiltered; float airspeedSp; - float airspeed; - float airspeedFiltered; + float airspeed_filtered; float airspeedDerivativeSp; float airspeedDerivative; |