diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2014-10-05 10:55:12 +0200 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2014-10-05 10:55:12 +0200 |
| commit | 3cebfd40453cc730c298d27790b9492a64f179e0 (patch) | |
| tree | d581550c02af9c682ff30a30645121073ae8befd /src/modules/mavlink/mavlink_receiver.cpp | |
| parent | 70e5d4027a3b1465d5128dbf9a04cbb6545e043d (diff) | |
| parent | 63b7fac10cf4d43e3df7e692336be869a4c124cc (diff) | |
| download | px4-firmware-3cebfd40453cc730c298d27790b9492a64f179e0.tar.gz px4-firmware-3cebfd40453cc730c298d27790b9492a64f179e0.tar.bz2 px4-firmware-3cebfd40453cc730c298d27790b9492a64f179e0.zip | |
Merge remote-tracking branch 'upstream/master' into takeoff_fix
Conflicts:
src/modules/navigator/mission.cpp
Diffstat (limited to 'src/modules/mavlink/mavlink_receiver.cpp')
| -rw-r--r-- | src/modules/mavlink/mavlink_receiver.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/modules/mavlink/mavlink_receiver.cpp b/src/modules/mavlink/mavlink_receiver.cpp index 373d06d4d..0ac62d545 100644 --- a/src/modules/mavlink/mavlink_receiver.cpp +++ b/src/modules/mavlink/mavlink_receiver.cpp @@ -534,6 +534,8 @@ MavlinkReceiver::handle_message_radio_status(mavlink_message_t *msg) tstatus.remote_noise = rstatus.remnoise; tstatus.rxerrors = rstatus.rxerrors; tstatus.fixed = rstatus.fixed; + tstatus.system_id = msg->sysid; + tstatus.component_id = msg->compid; if (_telemetry_status_pub < 0) { _telemetry_status_pub = orb_advertise(telemetry_status_orb_id[_mavlink->get_channel()], &tstatus); |