aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLorenz Meier <lm@inf.ethz.ch>2015-04-25 09:45:16 +0200
committerLorenz Meier <lm@inf.ethz.ch>2015-04-25 09:45:16 +0200
commitaf22c49497aac4dda0ea7f941ac27e82dd5471a7 (patch)
treebe81b0cd02c5f2526c4a0a2b5fa227b126b668a1
parent75df06bc763f52016ecf7df1d5a43e90d97c13c1 (diff)
downloadpx4-firmware-af22c49497aac4dda0ea7f941ac27e82dd5471a7.tar.gz
px4-firmware-af22c49497aac4dda0ea7f941ac27e82dd5471a7.tar.bz2
px4-firmware-af22c49497aac4dda0ea7f941ac27e82dd5471a7.zip
MAVLink app: send correct value when not estimating battery charge level
-rw-r--r--src/modules/mavlink/mavlink_messages.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/modules/mavlink/mavlink_messages.cpp b/src/modules/mavlink/mavlink_messages.cpp
index 5adfea36b..276035aa2 100644
--- a/src/modules/mavlink/mavlink_messages.cpp
+++ b/src/modules/mavlink/mavlink_messages.cpp
@@ -539,7 +539,8 @@ protected:
msg.errors_count2 = status.errors_count2;
msg.errors_count3 = status.errors_count3;
msg.errors_count4 = status.errors_count4;
- msg.battery_remaining = status.battery_remaining * 100.0f;
+ msg.battery_remaining = (msg.voltage_battery > 0) ?
+ status.battery_remaining * 100.0f : -1;
_mavlink->send_message(MAVLINK_MSG_ID_SYS_STATUS, &msg);
}