diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2014-01-31 09:51:59 +0100 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-01-31 09:51:59 +0100 |
| commit | d2b183c05bba5443d24e8df8b6fc5f52bd27275d (patch) | |
| tree | 99b1ee91cbb108a35ce00c8cc632f635c6022f03 /src/modules/commander/commander_helper.h | |
| parent | fb446c01b815b00f5da098d340557164fdbf78c9 (diff) | |
| parent | 83df116c7aa21b6d68f2aa31c4526dd822495d70 (diff) | |
| download | px4-firmware-d2b183c05bba5443d24e8df8b6fc5f52bd27275d.tar.gz px4-firmware-d2b183c05bba5443d24e8df8b6fc5f52bd27275d.tar.bz2 px4-firmware-d2b183c05bba5443d24e8df8b6fc5f52bd27275d.zip | |
merge master
Diffstat (limited to 'src/modules/commander/commander_helper.h')
| -rw-r--r-- | src/modules/commander/commander_helper.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/modules/commander/commander_helper.h b/src/modules/commander/commander_helper.h index e9514446c..d0393f45a 100644 --- a/src/modules/commander/commander_helper.h +++ b/src/modules/commander/commander_helper.h @@ -75,12 +75,13 @@ void rgbled_set_mode(rgbled_mode_t mode); void rgbled_set_pattern(rgbled_pattern_t *pattern); /** - * Provides a coarse estimate of remaining battery power. + * Estimate remaining battery charge. * - * The estimate is very basic and based on decharging voltage curves. + * Use integral of current if battery capacity known (BAT_CAPACITY parameter set), + * else use simple estimate based on voltage. * * @return the estimated remaining capacity in 0..1 */ -float battery_remaining_estimate_voltage(float voltage); +float battery_remaining_estimate_voltage(float voltage, float discharged); #endif /* COMMANDER_HELPER_H_ */ |