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

battery_status: naming consistency current_filtered_a -> current_average_a

Browse Source
This commit is contained in:
Matthias Grob
2021-07-01 14:24:38 +02:00
parent 41cc73e555
commit 9c0c85c9e2
6 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/drivers/uavcan/sensors/battery.cpp
+1 -1
View File
@@ -69,7 +69,7 @@ UavcanBatteryBridge::battery_sub_cb(const uavcan::ReceivedDataStructure<uavcan::
battery.voltage_filtered_v = msg.voltage;
battery.current_a = msg.current;
battery.current_filtered_a = msg.current;
// battery.average_current_a = msg.;
// battery.current_average_a = msg.;
sumDischarged(battery.timestamp, battery.current_a);
battery.discharged_mah = _discharged_mah;
src/drivers/uavcan/sensors/cbat.cpp
+1 -1
View File
@@ -68,7 +68,7 @@ UavcanCBATBridge::battery_sub_cb(const uavcan::ReceivedDataStructure<cuav::equip
battery.voltage_filtered_v = battery.voltage_v;
battery.current_a = msg.current;
battery.current_filtered_a = battery.current_a;
battery.average_current_a = msg.average_current;
battery.current_average_a = msg.average_current;
battery.discharged_mah = msg.passed_charge * 1000;
battery.remaining = msg.state_of_charge / 100.0f;
// battery.scale = msg.; // Power scaling factor, >= 1, or -1 if unknown