diff options
| author | Julian Oes <julian@oes.ch> | 2014-04-26 11:59:33 +0200 |
|---|---|---|
| committer | Julian Oes <julian@oes.ch> | 2014-04-26 11:59:33 +0200 |
| commit | db5266d3dfe65d0c8111e385f1306fbaf4231a1f (patch) | |
| tree | 5f9b9a47297617b612a17d3791c209039ec7baf7 /src/modules/mavlink/mavlink_main.cpp | |
| parent | 3411d58dfc1698d83b5cb8feeec4b82db65a25ee (diff) | |
| parent | f0298e005a7d8f7bb0b9df98e64a2c59ff04d2b0 (diff) | |
| download | px4-firmware-db5266d3dfe65d0c8111e385f1306fbaf4231a1f.tar.gz px4-firmware-db5266d3dfe65d0c8111e385f1306fbaf4231a1f.tar.bz2 px4-firmware-db5266d3dfe65d0c8111e385f1306fbaf4231a1f.zip | |
Merge remote-tracking branch 'px4/master' into navigator_cleanup
Diffstat (limited to 'src/modules/mavlink/mavlink_main.cpp')
| -rw-r--r-- | src/modules/mavlink/mavlink_main.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/modules/mavlink/mavlink_main.cpp b/src/modules/mavlink/mavlink_main.cpp index 30d400f31..1ba3d70c6 100644 --- a/src/modules/mavlink/mavlink_main.cpp +++ b/src/modules/mavlink/mavlink_main.cpp @@ -208,6 +208,7 @@ Mavlink::Mavlink() : _mavlink_fd(-1), _task_running(false), _hil_enabled(false), + _use_hil_gps(false), _is_usb_uart(false), _wait_to_transmit(false), _received_messages(false), @@ -487,11 +488,13 @@ void Mavlink::mavlink_update_system(void) static param_t param_system_id; static param_t param_component_id; static param_t param_system_type; + static param_t param_use_hil_gps; if (!initialized) { param_system_id = param_find("MAV_SYS_ID"); param_component_id = param_find("MAV_COMP_ID"); param_system_type = param_find("MAV_TYPE"); + param_use_hil_gps = param_find("MAV_USEHILGPS"); initialized = true; } @@ -516,6 +519,11 @@ void Mavlink::mavlink_update_system(void) if (system_type >= 0 && system_type < MAV_TYPE_ENUM_END) { mavlink_system.type = system_type; } + + int32_t use_hil_gps; + param_get(param_use_hil_gps, &use_hil_gps); + + _use_hil_gps = (bool)use_hil_gps; } int Mavlink::mavlink_open_uart(int baud, const char *uart_name, struct termios *uart_config_original, bool *is_usb) |