aboutsummaryrefslogtreecommitdiff
path: root/src/modules/mavlink/mavlink_main.h
diff options
context:
space:
mode:
authorAnton Babushkin <anton.babushkin@me.com>2014-03-11 11:12:39 +0400
committerAnton Babushkin <anton.babushkin@me.com>2014-03-11 11:12:39 +0400
commitb3839afbbc904fe0009610dae57a4626b3306fb6 (patch)
tree381e1377c84405c53ca8363b5991cbcf0d83769d /src/modules/mavlink/mavlink_main.h
parenta6d9b7e864334381a99f4438aeea1173229bc2dd (diff)
downloadpx4-firmware-b3839afbbc904fe0009610dae57a4626b3306fb6.tar.gz
px4-firmware-b3839afbbc904fe0009610dae57a4626b3306fb6.tar.bz2
px4-firmware-b3839afbbc904fe0009610dae57a4626b3306fb6.zip
mavlink: channel ID allocation fixed
Diffstat (limited to 'src/modules/mavlink/mavlink_main.h')
-rw-r--r--src/modules/mavlink/mavlink_main.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/modules/mavlink/mavlink_main.h b/src/modules/mavlink/mavlink_main.h
index b52c12796..c606da504 100644
--- a/src/modules/mavlink/mavlink_main.h
+++ b/src/modules/mavlink/mavlink_main.h
@@ -105,7 +105,7 @@ public:
/**
* Constructor
*/
- Mavlink();
+ Mavlink(int instance_id);
/**
* Destructor, also kills the mavlinks task.
@@ -182,6 +182,8 @@ public:
MavlinkOrbSubscription *add_orb_subscription(const orb_id_t topic);
+ int get_instance_id();
+
mavlink_channel_t get_channel();
bool _task_should_exit; /**< if true, mavlink task should exit */
@@ -190,6 +192,8 @@ protected:
Mavlink *next;
private:
+ int _instance_id;
+
int _mavlink_fd;
bool _task_running;