diff options
| author | Anton Babushkin <anton.babushkin@me.com> | 2014-04-25 21:39:59 +0200 |
|---|---|---|
| committer | Anton Babushkin <anton.babushkin@me.com> | 2014-04-25 21:39:59 +0200 |
| commit | 0c1de817852dfcbb00b19bd52a16ce80e3c2bbb4 (patch) | |
| tree | 83633532329f235c689e4121b75c2b7e1e240e3e /src/modules/mavlink/mavlink_main.h | |
| parent | 22aaae197b443cc7248588ebdf6aeffe078e0a43 (diff) | |
| parent | f0298e005a7d8f7bb0b9df98e64a2c59ff04d2b0 (diff) | |
| download | px4-firmware-0c1de817852dfcbb00b19bd52a16ce80e3c2bbb4.tar.gz px4-firmware-0c1de817852dfcbb00b19bd52a16ce80e3c2bbb4.tar.bz2 px4-firmware-0c1de817852dfcbb00b19bd52a16ce80e3c2bbb4.zip | |
Merge branch 'master' into mpc_rc
Diffstat (limited to 'src/modules/mavlink/mavlink_main.h')
| -rw-r--r-- | src/modules/mavlink/mavlink_main.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/modules/mavlink/mavlink_main.h b/src/modules/mavlink/mavlink_main.h index 66d82b471..1bf51fd31 100644 --- a/src/modules/mavlink/mavlink_main.h +++ b/src/modules/mavlink/mavlink_main.h @@ -157,6 +157,8 @@ public: bool get_hil_enabled() { return _hil_enabled; } + bool get_use_hil_gps() { return _use_hil_gps; } + bool get_flow_control_enabled() { return _flow_control_enabled; } bool get_forwarding_on() { return _forwarding_on; } @@ -223,6 +225,7 @@ private: /* states */ bool _hil_enabled; /**< Hardware In the Loop mode */ + bool _use_hil_gps; /**< Accept GPS HIL messages (for example from an external motion capturing system to fake indoor gps) */ bool _is_usb_uart; /**< Port is USB */ bool _wait_to_transmit; /**< Wait to transmit until received messages. */ bool _received_messages; /**< Whether we've received valid mavlink messages. */ |