yemai/bizhang_-obav
1
0
Fork 0
mirror of https://gitee.com/xiaohuolufeihua/bizhang_-obav.git synced 2026-05-21 01:12:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix formattting

Browse Source
This commit is contained in:
nanthony21
2018-02-10 20:15:29 -06:00
committed by Lorenz Meier
parent 53b4f6406f
commit a637063965
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/modules/systemlib/battery.cpp
View File

@@ -174,7 +174,7 @@ Battery::estimateRemaining(float voltage_v, float current_a, float throttle_norm
// remaining battery capacity based on voltage // remaining battery capacity based on voltage
float cell_voltage = voltage_v / _n_cells.get(); float cell_voltage = voltage_v / _n_cells.get();
// correct battery voltage locally for load drop to avoid estimation fluctuations // correct battery voltage locally for load drop to avoid estimation fluctuations
if (_r_internal.get() >= 0.f) { if (_r_internal.get() >= 0.f) {
cell_voltage += _r_internal.get() * current_a; cell_voltage += _r_internal.get() * current_a;
@@ -184,6 +184,7 @@ Battery::estimateRemaining(float voltage_v, float current_a, float throttle_norm
// good assumption if throttle represents RPM // good assumption if throttle represents RPM
cell_voltage += throttle_normalized * throttle_normalized * _v_load_drop.get(); cell_voltage += throttle_normalized * throttle_normalized * _v_load_drop.get();
} }
_remaining_voltage = math::gradual(cell_voltage, _v_empty.get(), _v_charged.get(), 0.f, 1.f); _remaining_voltage = math::gradual(cell_voltage, _v_empty.get(), _v_charged.get(), 0.f, 1.f);
// choose which quantity we're using for final reporting // choose which quantity we're using for final reporting