diff options
| author | Anton Babushkin <anton.babushkin@me.com> | 2014-03-08 22:19:18 +0400 |
|---|---|---|
| committer | Anton Babushkin <anton.babushkin@me.com> | 2014-03-08 22:19:18 +0400 |
| commit | b165e6ba2000f89b1220393e469911f3e3a73286 (patch) | |
| tree | d01b603f884389aef6975a5e6532b9c1524bcc74 /src/modules/mavlink | |
| parent | e0fbb0fb6079cffe1e3ab254caa4fd07906e9f7d (diff) | |
| parent | 501dc0cfa7259a1916522e5b70a5fd31cb7d20e1 (diff) | |
| download | px4-firmware-b165e6ba2000f89b1220393e469911f3e3a73286.tar.gz px4-firmware-b165e6ba2000f89b1220393e469911f3e3a73286.tar.bz2 px4-firmware-b165e6ba2000f89b1220393e469911f3e3a73286.zip | |
Merge branch 'master' into acro2
Diffstat (limited to 'src/modules/mavlink')
| -rw-r--r-- | src/modules/mavlink/mavlink.c | 12 | ||||
| -rw-r--r-- | src/modules/mavlink/mavlink_receiver.cpp | 2 |
2 files changed, 13 insertions, 1 deletions
diff --git a/src/modules/mavlink/mavlink.c b/src/modules/mavlink/mavlink.c index 22465a3da..176ecb8a8 100644 --- a/src/modules/mavlink/mavlink.c +++ b/src/modules/mavlink/mavlink.c @@ -76,8 +76,20 @@ #include <uORB/topics/mission_result.h> /* define MAVLink specific parameters */ +/** + * MAVLink system ID + * @group MAVLink + */ PARAM_DEFINE_INT32(MAV_SYS_ID, 1); +/** + * MAVLink component ID + * @group MAVLink + */ PARAM_DEFINE_INT32(MAV_COMP_ID, 50); +/** + * MAVLink type + * @group MAVLink + */ PARAM_DEFINE_INT32(MAV_TYPE, MAV_TYPE_FIXED_WING); __EXPORT int mavlink_main(int argc, char *argv[]); diff --git a/src/modules/mavlink/mavlink_receiver.cpp b/src/modules/mavlink/mavlink_receiver.cpp index a371a499e..1dbe56495 100644 --- a/src/modules/mavlink/mavlink_receiver.cpp +++ b/src/modules/mavlink/mavlink_receiver.cpp @@ -351,7 +351,7 @@ handle_message(mavlink_message_t *msg) tstatus.rxerrors = rstatus.rxerrors; tstatus.fixed = rstatus.fixed; - if (telemetry_status_pub == 0) { + if (telemetry_status_pub <= 0) { telemetry_status_pub = orb_advertise(ORB_ID(telemetry_status), &tstatus); } else { |