pinetime/wasp-os
1
0
Fork 0
Code Activity

Merge pull request #387 from thiswillbeyourgithub/battery_smoothing

Browse source 
fix: battery level is not reset when charging without rebooting
This commit is contained in:
Daniel Thompson 2023-01-15 14:27:03 +00:00 committed by GitHub
commit 8ad72f1fb5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
wasp/drivers/battery.py
View file

@ -8,6 +8,7 @@ import micropython
# don't remove Pin import even though your IDE tells you it's unused, otherwise # don't remove Pin import even though your IDE tells you it's unused, otherwise
# micropython can't load your battery level. # micropython can't load your battery level.
from machine import Pin, ADC from machine import Pin, ADC
import array
class Battery(object): class Battery(object):
"""Generic lithium ion battery driver. """Generic lithium ion battery driver.
@ -28,7 +29,7 @@ class Battery(object):
self._battery = ADC(battery) self._battery = ADC(battery)
self._charging = charging self._charging = charging
self._power = power self._power = power
self._cache = set() self._cache = array.array("I")
@micropython.native @micropython.native
def charging(self): def charging(self):
@ -62,12 +63,21 @@ class Battery(object):
""" """
raw = self._battery.read_u16() raw = self._battery.read_u16()
mv = (2 * 3300 * raw) // 65535 mv = (2 * 3300 * raw) // 65535
cache = self._cache
if mv not in self._cache: if self._charging.value(): # if charging, reset cache
self._cache.add(mv) if len(cache):
while len(self._cache) > 2: cache = array.array("I")
self._cache.remove(max(self._cache)) return mv
return min(self._cache) if len(cache) < 2:
cache.append(mv)
return mv
if len(cache) > 2: # should not happen
cache = cache[-2:]
if mv != cache[0] and mv != cache[1]:
cache[0] = cache[1]
cache[1] = mv
return sum(cache) / 2
def level(self): def level(self):
"""Estimate the battery level. """Estimate the battery level.
@ -81,6 +91,5 @@ class Battery(object):
:returns: Estimate battery level in percent. :returns: Estimate battery level in percent.
""" """
mv = self.voltage_mv() mv = self.voltage_mv()
level = ((19 * mv) // 100) - 660 level = int((mv - 3500) / (700) * 100) # 0.7V is 4.2-3.5V
level = min(100, max(0, level)) return min(100, max(0, level))
return level