fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-07-01 15:30:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

battery_status: clearly define and handle zero remaining flight time

Browse Source
This commit is contained in:
Matthias Grob
2021-09-16 11:15:44 +02:00
parent 73287e8e8c
commit 91c48606ee
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/mavlink/streams/BATTERY_STATUS.hpp
+2 -2
View File
@@ -76,8 +76,8 @@ private:
bat_msg.energy_consumed = -1;
bat_msg.current_battery = (battery_status.connected) ? battery_status.current_filtered_a * 100 : -1;
bat_msg.battery_remaining = (battery_status.connected) ? ceilf(battery_status.remaining * 100.f) : -1;
// MAVLink extension: 0 is unsupported, in uORB it's -1
bat_msg.time_remaining = (battery_status.connected && (battery_status.time_remaining_s >= 0.f)) ?
// MAVLink extension: 0 is unsupported, in uORB it's NAN
bat_msg.time_remaining = (battery_status.connected && (PX4_ISFINITE(battery_status.time_remaining_s))) ?
math::max((int)battery_status.time_remaining_s, 1) : 0;
switch (battery_status.warning) {