diff options
author | Lorenz Meier <lm@inf.ethz.ch> | 2014-07-07 22:33:29 +0200 |
---|---|---|
committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-07-07 22:33:29 +0200 |
commit | 103b129f0d48bf84b6161a4b55cb8dd649b8c903 (patch) | |
tree | 01dbb991f13d242d0a5a7fd3b3e2d2ad9a9cd95b /src/modules/uORB/topics/manual_control_setpoint.h | |
parent | 20e871439be1cada5a7c810f887a2495e7ff6308 (diff) | |
parent | a23c2e3dd2bba016a63213ebc64378b40a2f5967 (diff) | |
download | px4-firmware-103b129f0d48bf84b6161a4b55cb8dd649b8c903.tar.gz px4-firmware-103b129f0d48bf84b6161a4b55cb8dd649b8c903.tar.bz2 px4-firmware-103b129f0d48bf84b6161a4b55cb8dd649b8c903.zip |
Merge pull request #1110 from PX4/offboard2_merge
Offboard2 merge
Diffstat (limited to 'src/modules/uORB/topics/manual_control_setpoint.h')
-rw-r--r-- | src/modules/uORB/topics/manual_control_setpoint.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/modules/uORB/topics/manual_control_setpoint.h b/src/modules/uORB/topics/manual_control_setpoint.h index 910b8a623..dde237adc 100644 --- a/src/modules/uORB/topics/manual_control_setpoint.h +++ b/src/modules/uORB/topics/manual_control_setpoint.h @@ -98,6 +98,7 @@ struct manual_control_setpoint_s { switch_pos_t posctl_switch; /**< position control 2 position switch (optional): _ALTCTL_, POSCTL */ switch_pos_t loiter_switch; /**< loiter 2 position switch (optional): _MISSION_, LOITER */ switch_pos_t acro_switch; /**< acro 2 position switch (optional): _MANUAL_, ACRO */ + switch_pos_t offboard_switch; /**< offboard 2 position switch (optional): _NORMAL_, OFFBOARD */ }; /**< manual control inputs */ /** |