diff options
| author | Julian Oes <julian@oes.ch> | 2014-06-20 18:18:39 +0200 |
|---|---|---|
| committer | Julian Oes <julian@oes.ch> | 2014-06-20 18:18:39 +0200 |
| commit | 4e08457afec89e41bb14fb09293c885f988bfd0c (patch) | |
| tree | 9ad5c352c75efcdabc4a0f3c9c6325cbda5f074a /src/modules/commander/px4_custom_mode.h | |
| parent | e0c78e51e3a5768014c73bed5cd087830d602227 (diff) | |
| parent | 9d18da4433773cfa02bec1d33fdb34e4d03d1442 (diff) | |
| download | px4-firmware-4e08457afec89e41bb14fb09293c885f988bfd0c.tar.gz px4-firmware-4e08457afec89e41bb14fb09293c885f988bfd0c.tar.bz2 px4-firmware-4e08457afec89e41bb14fb09293c885f988bfd0c.zip | |
Merge remote-tracking branch 'px4/pr/1058' into navigator_rewrite_offboard
Conflicts:
src/modules/commander/commander.cpp
src/modules/commander/state_machine_helper.cpp
src/modules/mavlink/mavlink_receiver.cpp
src/modules/mavlink/mavlink_receiver.h
src/modules/uORB/topics/vehicle_status.h
Diffstat (limited to 'src/modules/commander/px4_custom_mode.h')
| -rw-r--r-- | src/modules/commander/px4_custom_mode.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/modules/commander/px4_custom_mode.h b/src/modules/commander/px4_custom_mode.h index 7f5f93801..eaf309288 100644 --- a/src/modules/commander/px4_custom_mode.h +++ b/src/modules/commander/px4_custom_mode.h @@ -16,6 +16,7 @@ enum PX4_CUSTOM_MAIN_MODE { PX4_CUSTOM_MAIN_MODE_POSCTL, PX4_CUSTOM_MAIN_MODE_AUTO, PX4_CUSTOM_MAIN_MODE_ACRO, + PX4_CUSTOM_MAIN_MODE_OFFBOARD, }; enum PX4_CUSTOM_SUB_MODE_AUTO { |