diff options
| author | Anton Babushkin <anton.babushkin@me.com> | 2014-03-11 23:03:49 +0400 |
|---|---|---|
| committer | Anton Babushkin <anton.babushkin@me.com> | 2014-03-11 23:03:49 +0400 |
| commit | 1fd7b89d3c7c5f9b5c13198c41a015d6c5899260 (patch) | |
| tree | a18e302dff6ca8bc65899d3ac928ce29c2a8db92 /src/modules/mavlink/mavlink_main.h | |
| parent | 0bcda7f8a6079ba20eeb4bbd4181872a5513acfc (diff) | |
| download | px4-firmware-1fd7b89d3c7c5f9b5c13198c41a015d6c5899260.tar.gz px4-firmware-1fd7b89d3c7c5f9b5c13198c41a015d6c5899260.tar.bz2 px4-firmware-1fd7b89d3c7c5f9b5c13198c41a015d6c5899260.zip | |
mavlink: use "normal" mode for HIL operation, only add HIL_CONTROLS stream when HIL enabled
Diffstat (limited to 'src/modules/mavlink/mavlink_main.h')
| -rw-r--r-- | src/modules/mavlink/mavlink_main.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/modules/mavlink/mavlink_main.h b/src/modules/mavlink/mavlink_main.h index cc4c896b9..3a8625c6b 100644 --- a/src/modules/mavlink/mavlink_main.h +++ b/src/modules/mavlink/mavlink_main.h @@ -145,16 +145,14 @@ public: const char *_device_name; enum MAVLINK_MODE { - MODE_CUSTOM = 0, - MODE_OFFBOARD, - MODE_ONBOARD, - MODE_HIL + MAVLINK_MODE_NORMAL = 0, + MAVLINK_MODE_CUSTOM }; void set_mode(enum MAVLINK_MODE); enum MAVLINK_MODE get_mode() { return _mode; } - bool get_hil_enabled() { return _mavlink_hil_enabled; }; + bool get_hil_enabled() { return _hil_enabled; }; /** * Handle waypoint related messages. @@ -200,7 +198,7 @@ private: perf_counter_t _loop_perf; /**< loop performance counter */ /* states */ - bool _mavlink_hil_enabled; /**< Hardware In the Loop mode */ + bool _hil_enabled; /**< Hardware In the Loop mode */ unsigned _main_loop_delay; /**< mainloop delay, depends on data rate */ |