pinetime/wasp-os
1
0
Fork 0
Code Activity

apps: steps: Switch over the status bar widget

Browse source 
Signed-off-by: Daniel Thompson <daniel@redfelineninja.org.uk>
This commit is contained in:
Daniel Thompson 2020-10-21 21:29:15 +01:00
parent fd4017c729
commit 37f8a47220
1 changed files with 11 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
wasp/apps/steps.py
View file

@ -42,16 +42,12 @@ class StepCounterApp():
def __init__(self): def __init__(self):
watch.accel.reset() watch.accel.reset()
self._meter = wasp.widgets.BatteryMeter() self._bar = wasp.widgets.StatusBar()
self._count = 0 self._count = 0
self._last_clock = ( -1, -1, -1, -1, -1, -1 ) self._prev_day = -1
def foreground(self): def foreground(self):
"""Activate the application.""" """Activate the application."""
# Force a redraw (without forgetting the current date)
lc = self._last_clock
self._last_clock = (lc[0], lc[1], lc[2], -1, -1, -1)
self._draw() self._draw()
wasp.system.request_tick(1000) wasp.system.request_tick(1000)
@ -65,28 +61,22 @@ class StepCounterApp():
draw.fill() draw.fill()
draw.blit(feet, 12, 132-24) draw.blit(feet, 12, 132-24)
self._last_count = -1
self._update() self._update()
self._meter.draw() self._bar.draw()
def _update(self): def _update(self):
draw = wasp.watch.drawable draw = wasp.watch.drawable
# Lazy update of the clock and battery meter # Update the status bar
now = wasp.watch.rtc.get_localtime() now = self._bar.update()
if now[4] != self._last_clock[4]:
t1 = '{:02}:{:02}'.format(now[3], now[4])
draw.set_font(fonts.sans28)
draw.set_color(0x7bef)
draw.string(t1, 48, 12, 240-96)
if now[2] != self._last_clock[2]: # Reset the step counter if we have move onto the next day
if now and now[2] != self._prev_day:
watch.accel.steps = 0 watch.accel.steps = 0
draw.fill(0, 60, 132-18, 180, 36) draw.fill(0, 60, 132-18, 180, 36)
self._prev_day = now[2]
self._last_clock = now # Update the step count
self._meter.update()
count = watch.accel.steps count = watch.accel.steps
t = str(count) t = str(count)
w = fonts.width(fonts.sans36, t) w = fonts.width(fonts.sans36, t)