diff options
| author | Julian Oes <julian@oes.ch> | 2014-02-11 14:38:18 +0100 |
|---|---|---|
| committer | Julian Oes <julian@oes.ch> | 2014-02-11 14:38:18 +0100 |
| commit | a5045ccee663c500011b8a5a94554f4cbb263352 (patch) | |
| tree | 392b792ba4e23f0e548a7a4494a6a727ac2f568c /src/modules/mavlink/mavlink_main.h | |
| parent | 8d2d171bb83c4f24f709c20ce8c89b6d1f529616 (diff) | |
| download | px4-firmware-a5045ccee663c500011b8a5a94554f4cbb263352.tar.gz px4-firmware-a5045ccee663c500011b8a5a94554f4cbb263352.tar.bz2 px4-firmware-a5045ccee663c500011b8a5a94554f4cbb263352.zip | |
Mavlink: get rid of some warnings, initialize channel
Diffstat (limited to 'src/modules/mavlink/mavlink_main.h')
| -rw-r--r-- | src/modules/mavlink/mavlink_main.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/modules/mavlink/mavlink_main.h b/src/modules/mavlink/mavlink_main.h index bf8c63d38..8c9430829 100644 --- a/src/modules/mavlink/mavlink_main.h +++ b/src/modules/mavlink/mavlink_main.h @@ -182,7 +182,7 @@ public: void set_mode(enum MAVLINK_MODE); enum MAVLINK_MODE get_mode() { return _mode; } - bool hil_enabled() { return _mavlink_hil_enabled; }; + bool get_hil_enabled() { return _mavlink_hil_enabled; }; /** * Handle waypoint related messages. @@ -206,7 +206,7 @@ public: * requested change could not be made or was * redundant. */ - int set_hil_on_off(bool hil_enabled); + int set_hil_enabled(bool hil_enabled); struct mavlink_subscriptions { int sensor_sub; @@ -242,7 +242,7 @@ public: struct mavlink_subscriptions subs; struct mavlink_subscriptions* get_subs() { return &subs; } - mavlink_channel_t get_chan() { return chan; } + mavlink_channel_t get_chan() { return _chan; } /** Global position */ struct vehicle_global_position_s global_pos; @@ -289,7 +289,7 @@ private: MAVLINK_MODE _mode; uint8_t mavlink_wpm_comp_id; - mavlink_channel_t chan; + mavlink_channel_t _chan; // XXX probably should be in a header... // extern pthread_t receive_start(int uart); |