diff options
| author | Julian Oes <julian@oes.ch> | 2014-04-07 21:45:45 +0200 |
|---|---|---|
| committer | Julian Oes <julian@oes.ch> | 2014-04-07 21:45:45 +0200 |
| commit | fc2bfb828f0f2ba681da1b33addd03698db4b679 (patch) | |
| tree | a133e82429f186e8b7b727092944777f4d0b6d42 /src/modules/mavlink/mavlink_messages.cpp | |
| parent | 38c3e68976c8dc167b4d1e5d24792401fc7cc7d3 (diff) | |
| parent | e4628fbed641496704011b0c488a36ed05b45d5f (diff) | |
| download | px4-firmware-fc2bfb828f0f2ba681da1b33addd03698db4b679.tar.gz px4-firmware-fc2bfb828f0f2ba681da1b33addd03698db4b679.tar.bz2 px4-firmware-fc2bfb828f0f2ba681da1b33addd03698db4b679.zip | |
Merge remote-tracking branch 'px4/master' into mavlink_broadcast
Diffstat (limited to 'src/modules/mavlink/mavlink_messages.cpp')
| -rw-r--r-- | src/modules/mavlink/mavlink_messages.cpp | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/src/modules/mavlink/mavlink_messages.cpp b/src/modules/mavlink/mavlink_messages.cpp index 1e6bd6f93..45b86a497 100644 --- a/src/modules/mavlink/mavlink_messages.cpp +++ b/src/modules/mavlink/mavlink_messages.cpp @@ -262,22 +262,21 @@ protected: void send(const hrt_abstime t) { - if (status_sub->update(t)) { - mavlink_msg_sys_status_send(_channel, - status->onboard_control_sensors_present, - status->onboard_control_sensors_enabled, - status->onboard_control_sensors_health, - status->load * 1000.0f, - status->battery_voltage * 1000.0f, - status->battery_current * 1000.0f, - status->battery_remaining, - status->drop_rate_comm, - status->errors_comm, - status->errors_count1, - status->errors_count2, - status->errors_count3, - status->errors_count4); - } + status_sub->update(t); + mavlink_msg_sys_status_send(_channel, + status->onboard_control_sensors_present, + status->onboard_control_sensors_enabled, + status->onboard_control_sensors_health, + status->load * 1000.0f, + status->battery_voltage * 1000.0f, + status->battery_current * 1000.0f, + status->battery_remaining, + status->drop_rate_comm, + status->errors_comm, + status->errors_count1, + status->errors_count2, + status->errors_count3, + status->errors_count4); } }; |