mirror of
https://gitee.com/mirrors_PX4/PX4-Autopilot.git
synced 2026-11-17 03:21:35 +08:00
Update to RFC with capacity_ fields
This commit is contained in:
@@ -71,7 +71,7 @@ private:
|
|||||||
|
|
||||||
// TODO: Determine how to better map between battery ID within the firmware and in MAVLink
|
// TODO: Determine how to better map between battery ID within the firmware and in MAVLink
|
||||||
bat_msg.id = battery_status.id - 1;
|
bat_msg.id = battery_status.id - 1;
|
||||||
bat_msg.current_consumed = (battery_status.connected) ? battery_status.discharged_mah : UINT32_MAX;
|
bat_msg.capacity_consumed = (battery_status.connected) ? battery_status.discharged_mah : UINT32_MAX;
|
||||||
bat_msg.current = (battery_status.connected) ? battery_status.current_filtered_a * 1000 : UINT32_MAX; // mA
|
bat_msg.current = (battery_status.connected) ? battery_status.current_filtered_a * 1000 : UINT32_MAX; // mA
|
||||||
bat_msg.percent_remaining = (battery_status.connected) ? roundf(battery_status.remaining * 100.f) : UINT32_MAX;
|
bat_msg.percent_remaining = (battery_status.connected) ? roundf(battery_status.remaining * 100.f) : UINT32_MAX;
|
||||||
bat_msg.status_flags = battery_status.status_flags;
|
bat_msg.status_flags = battery_status.status_flags;
|
||||||
@@ -79,10 +79,10 @@ private:
|
|||||||
|
|
||||||
// get remaining charge in mAH
|
// get remaining charge in mAH
|
||||||
if (battery_status.connected && PX4_ISFINITE(battery_status.remaining_capacity_wh) && (battery_status.voltage_filtered_v > 0.f) ) {
|
if (battery_status.connected && PX4_ISFINITE(battery_status.remaining_capacity_wh) && (battery_status.voltage_filtered_v > 0.f) ) {
|
||||||
bat_msg.current_remaining = (battery_status.remaining_capacity_wh / battery_status.voltage_filtered_v) * 1000.f; // mAH
|
bat_msg.capacity_remaining = (battery_status.remaining_capacity_wh / battery_status.voltage_filtered_v) * 1000.f; // mAH
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
bat_msg.current_remaining = UINT32_MAX;
|
bat_msg.capacity_remaining = UINT32_MAX;
|
||||||
}
|
}
|
||||||
|
|
||||||
// check if temperature valid
|
// check if temperature valid
|
||||||
|
|||||||
Reference in New Issue
Block a user