diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2014-08-22 13:37:19 +0200 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2014-08-22 13:37:19 +0200 |
| commit | ccd468be6070ecb0062c2c4fe551d57d89b7f5b6 (patch) | |
| tree | a934f52b3f1e86693926b21e216c418befe6abe0 /src/modules/mavlink/mavlink_main.h | |
| parent | 1e7dee439111f58fa9c0f737b93132a57dbf644d (diff) | |
| parent | edffb2eede777f3c316bc8a144984d9d12cbd680 (diff) | |
| download | px4-firmware-ccd468be6070ecb0062c2c4fe551d57d89b7f5b6.tar.gz px4-firmware-ccd468be6070ecb0062c2c4fe551d57d89b7f5b6.tar.bz2 px4-firmware-ccd468be6070ecb0062c2c4fe551d57d89b7f5b6.zip | |
Merge remote-tracking branch 'upstream/master' into offboard2_externalsetpointmessages
Diffstat (limited to 'src/modules/mavlink/mavlink_main.h')
| -rw-r--r-- | src/modules/mavlink/mavlink_main.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/modules/mavlink/mavlink_main.h b/src/modules/mavlink/mavlink_main.h index d4d15d81f..1f96e586b 100644 --- a/src/modules/mavlink/mavlink_main.h +++ b/src/modules/mavlink/mavlink_main.h @@ -127,7 +127,7 @@ public: enum MAVLINK_MODE { MAVLINK_MODE_NORMAL = 0, MAVLINK_MODE_CUSTOM, - MAVLINK_MODE_CAMERA + MAVLINK_MODE_ONBOARD }; void set_mode(enum MAVLINK_MODE); |