diff options
Diffstat (limited to 'src/modules/uORB/topics/manual_control_setpoint.h')
| -rw-r--r-- | src/modules/uORB/topics/manual_control_setpoint.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/modules/uORB/topics/manual_control_setpoint.h b/src/modules/uORB/topics/manual_control_setpoint.h index b6257e22a..c61987df6 100644 --- a/src/modules/uORB/topics/manual_control_setpoint.h +++ b/src/modules/uORB/topics/manual_control_setpoint.h @@ -78,7 +78,11 @@ struct manual_control_setpoint_s { switch_pos_t mode_switch; /**< mode 3 position switch (mandatory): manual, assisted, auto */ switch_pos_t return_switch; /**< land 2 position switch (mandatory): land, no effect */ +<<<<<<< HEAD switch_pos_t easy_switch; /**< assisted 2 position switch (optional): seatbelt, simple */ +======= + switch_pos_t assisted_switch; /**< assisted 2 position switch (optional): seatbelt, simple */ +>>>>>>> ad77ba26427aa9a2d8b8241fc95271667a1c0863 switch_pos_t loiter_switch; /**< mission 2 position switch (optional): mission, loiter */ }; /**< manual control inputs */ |