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

battery: pass voltage and current by setter

Browse Source
This commit is contained in:
Matthias Grob
2021-12-01 18:16:59 +01:00
parent 39641494da
commit e70d70468a
10 changed files with 71 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/battery_status/analog_battery.cpp
+3 -1
View File
@@ -81,7 +81,9 @@ AnalogBattery::updateBatteryStatusADC(hrt_abstime timestamp, float voltage_raw,
(BOARD_ADC_OPEN_CIRCUIT_V <= BOARD_VALID_UV || is_valid());
Battery::setConnected(connected);
Battery::updateBatteryStatus(timestamp, voltage_v, current_a);
Battery::updateVoltage(voltage_v);
Battery::updateCurrent(current_a);
Battery::updateBatteryStatus(timestamp);
}
bool AnalogBattery::is_valid()
src/modules/esc_battery/EscBattery.cpp
+3 -4
View File
@@ -100,10 +100,9 @@ EscBattery::Run()
average_voltage_v /= esc_status.esc_count;
_battery.setConnected(true);
_battery.updateBatteryStatus(
esc_status.timestamp,
average_voltage_v,
total_current_a);
_battery.updateVoltage(average_voltage_v);
_battery.updateCurrent(total_current_a);
_battery.updateBatteryStatus(esc_status.timestamp);
}
}
src/modules/simulator/battery_simulator/BatterySimulator.cpp
+3 -1
View File
@@ -100,7 +100,9 @@ void BatterySimulator::Run()
vbatt *= _battery.cell_count();
_battery.setConnected(true);
_battery.updateBatteryStatus(now_us, vbatt, ibatt);
_battery.updateVoltage(vbatt);
_battery.updateCurrent(ibatt);
_battery.updateBatteryStatus(now_us);
perf_end(_loop_perf);
}