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/uORB/topics/telemetry_status.h | |
| 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/uORB/topics/telemetry_status.h')
| -rw-r--r-- | src/modules/uORB/topics/telemetry_status.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/modules/uORB/topics/telemetry_status.h b/src/modules/uORB/topics/telemetry_status.h index 1297c1a9d..93193f32b 100644 --- a/src/modules/uORB/topics/telemetry_status.h +++ b/src/modules/uORB/topics/telemetry_status.h @@ -67,6 +67,8 @@ struct telemetry_status_s { uint8_t noise; /**< background noise level */ uint8_t remote_noise; /**< remote background noise level */ uint8_t txbuf; /**< how full the tx buffer is as a percentage */ + uint8_t system_id; /**< system id of the remote system */ + uint8_t component_id; /**< component id of the remote system */ }; /** |