diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2014-11-24 07:41:26 +0100 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2014-11-24 07:41:26 +0100 |
| commit | c37ff71e625310cdc777719a04c3702d9afa1f7f (patch) | |
| tree | 714ecb7b510e7ff53080ce3f0caebe8b128a26f5 /src/modules/mavlink/mavlink_main.h | |
| parent | f36f54c621cb5b36d345c5a26f72e89fc948fa65 (diff) | |
| parent | 512779907e06f059a15d54c88d71b73aad9aced0 (diff) | |
| download | px4-firmware-c37ff71e625310cdc777719a04c3702d9afa1f7f.tar.gz px4-firmware-c37ff71e625310cdc777719a04c3702d9afa1f7f.tar.bz2 px4-firmware-c37ff71e625310cdc777719a04c3702d9afa1f7f.zip | |
Merge remote-tracking branch 'upstream/master' into ros
Conflicts:
makefiles/config_px4fmu-v2_test.mk
Diffstat (limited to 'src/modules/mavlink/mavlink_main.h')
| -rw-r--r-- | src/modules/mavlink/mavlink_main.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/modules/mavlink/mavlink_main.h b/src/modules/mavlink/mavlink_main.h index 1f96e586b..ad5e5001b 100644 --- a/src/modules/mavlink/mavlink_main.h +++ b/src/modules/mavlink/mavlink_main.h @@ -265,6 +265,8 @@ public: struct mavlink_logbuffer *get_logbuffer() { return &_logbuffer; } + unsigned get_system_type() { return _system_type; } + protected: Mavlink *next; @@ -354,6 +356,8 @@ private: param_t _param_use_hil_gps; param_t _param_forward_externalsp; + unsigned _system_type; + perf_counter_t _loop_perf; /**< loop performance counter */ perf_counter_t _txerr_perf; /**< TX error counter */ |