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

Commander: Fix dynamic battery scaling, proposed by @orangelynx. Fixes #2523.

Browse Source
This commit is contained in:
Lorenz Meier
2015-07-03 23:17:50 +02:00
parent ecaa25ba1a
commit e23459e850
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/commander/commander_helper.cpp
+6 -2
View File
@@ -382,8 +382,12 @@ float battery_remaining_estimate_voltage(float voltage, float discharged, float
counter++; counter++;
/* remaining charge estimate based on voltage and internal resistance (drop under load) */ /* remaining charge estimate based on voltage and internal resistance (drop under load) */
float bat_v_full_dynamic = bat_v_full - (bat_v_load_drop * throttle_normalized); float bat_v_empty_dynamic = bat_v_empty - (bat_v_load_drop * throttle_normalized);
float remaining_voltage = (voltage - (bat_n_cells * bat_v_empty)) / (bat_n_cells * (bat_v_full_dynamic - bat_v_empty)); /* the range from full to empty is the same for batteries under load and without load,
* since the voltage drop applies to both the full and empty state
*/
float voltage_range = (bat_v_full - bat_v_empty)
float remaining_voltage = (voltage - (bat_n_cells * bat_v_empty_dynamic)) / (bat_n_cells * voltage_range);
if (bat_capacity > 0.0f) { if (bat_capacity > 0.0f) {
/* if battery capacity is known, use discharged current for estimate, but don't show more than voltage estimate */ /* if battery capacity is known, use discharged current for estimate, but don't show more than voltage estimate */