wasp: stopwatch: Replace the stub with a "real" implementation
There are still some holes here. In particular the RTC resolution on nRF devices (such as PineTime) is currently a full second (meaning the centiseconds will always be zero. Nevertheless that isn't the apps fault... as we can see when we run on the simulator.
This commit is contained in:
parent
5fc802fb78
commit
10706a9704
2 changed files with 122 additions and 2 deletions
|
@ -3,17 +3,133 @@
|
||||||
|
|
||||||
import wasp
|
import wasp
|
||||||
import icons
|
import icons
|
||||||
|
import fonts
|
||||||
|
|
||||||
class StopwatchApp():
|
class StopwatchApp():
|
||||||
NAME = 'Stopwatch'
|
NAME = 'Timer'
|
||||||
ICON = icons.app
|
ICON = icons.app
|
||||||
|
|
||||||
|
def __init__(self):
|
||||||
|
self._meter = wasp.widgets.BatteryMeter()
|
||||||
|
self._reset()
|
||||||
|
self._count = 999*6000
|
||||||
|
|
||||||
def foreground(self):
|
def foreground(self):
|
||||||
"""Activate the application."""
|
"""Activate the application."""
|
||||||
|
self._last_clock = ( -1, -1, -1, -1, -1, -1 )
|
||||||
|
|
||||||
self._draw()
|
self._draw()
|
||||||
|
wasp.system.request_tick(97)
|
||||||
|
wasp.system.request_event(wasp.EventMask.TOUCH |
|
||||||
|
wasp.EventMask.BUTTON)
|
||||||
|
|
||||||
|
def sleep(self):
|
||||||
|
return True
|
||||||
|
|
||||||
|
def wake(self):
|
||||||
|
self._update()
|
||||||
|
|
||||||
|
def press(self, button, state):
|
||||||
|
if not state:
|
||||||
|
return
|
||||||
|
|
||||||
|
if self._started_at:
|
||||||
|
self._update()
|
||||||
|
self._started_at = 0
|
||||||
|
else:
|
||||||
|
uptime = wasp.watch.rtc.get_uptime_ms()
|
||||||
|
uptime //= 10
|
||||||
|
self._started_at = uptime - self._count
|
||||||
|
self._update()
|
||||||
|
|
||||||
|
def touch(self, event):
|
||||||
|
if self._started_at:
|
||||||
|
self._update()
|
||||||
|
self._splits.insert(0, self._count)
|
||||||
|
del self._splits[4:]
|
||||||
|
else:
|
||||||
|
self._reset()
|
||||||
|
self._update()
|
||||||
|
|
||||||
|
self._draw_splits()
|
||||||
|
|
||||||
|
def tick(self, ticks):
|
||||||
|
self._update()
|
||||||
|
|
||||||
|
def _reset(self):
|
||||||
|
self._started_at = 0
|
||||||
|
self._count = 0
|
||||||
|
self._last_count = -1
|
||||||
|
self._splits = []
|
||||||
|
|
||||||
|
def _draw_splits(self):
|
||||||
|
draw = wasp.watch.drawable
|
||||||
|
splits = self._splits
|
||||||
|
if 0 == len(splits):
|
||||||
|
draw.fill(0, 0, 120, 240, 120)
|
||||||
|
return
|
||||||
|
y = 240 - 12 - (len(splits) * 24)
|
||||||
|
for i, s in enumerate(splits):
|
||||||
|
if s:
|
||||||
|
centisecs = s
|
||||||
|
secs = centisecs // 100
|
||||||
|
centisecs %= 100
|
||||||
|
minutes = secs // 60
|
||||||
|
secs %= 60
|
||||||
|
|
||||||
|
t = '#{} {:02}:{:02}.{:02}'.format(i+1, minutes, secs, centisecs)
|
||||||
|
else:
|
||||||
|
t = ''
|
||||||
|
|
||||||
|
draw.set_font(fonts.sans24)
|
||||||
|
w = fonts.width(fonts.sans24, t)
|
||||||
|
draw.string(t, 0, y + (i*24), 240)
|
||||||
|
|
||||||
def _draw(self):
|
def _draw(self):
|
||||||
"""Draw the display from scratch."""
|
"""Draw the display from scratch."""
|
||||||
draw = wasp.watch.drawable
|
draw = wasp.watch.drawable
|
||||||
draw.fill()
|
draw.fill()
|
||||||
draw.string(self.NAME, 0, 6, width=240)
|
|
||||||
|
self._update()
|
||||||
|
self._meter.draw()
|
||||||
|
self._draw_splits()
|
||||||
|
|
||||||
|
def _update(self):
|
||||||
|
# Before we do anything else let's make sure _count is
|
||||||
|
# up to date
|
||||||
|
if self._started_at:
|
||||||
|
uptime = wasp.watch.rtc.get_uptime_ms()
|
||||||
|
uptime //= 10
|
||||||
|
self._count = uptime - self._started_at
|
||||||
|
if self._count > 999*60*100:
|
||||||
|
self._reset()
|
||||||
|
|
||||||
|
draw = wasp.watch.drawable
|
||||||
|
|
||||||
|
# Lazy update of the clock and battery meter
|
||||||
|
now = wasp.watch.rtc.get_localtime()
|
||||||
|
if now[4] != self._last_clock[4]:
|
||||||
|
t1 = '{:02}:{:02}'.format(now[3], now[4])
|
||||||
|
draw.set_font(fonts.sans24)
|
||||||
|
draw.string(t1, 48, 16, 240-96)
|
||||||
|
self._last_clock = now
|
||||||
|
self._meter.update()
|
||||||
|
|
||||||
|
if self._last_count != self._count:
|
||||||
|
centisecs = self._count
|
||||||
|
secs = centisecs // 100
|
||||||
|
centisecs %= 100
|
||||||
|
minutes = secs // 60
|
||||||
|
secs %= 60
|
||||||
|
|
||||||
|
t1 = '{}:{:02}'.format(minutes, secs)
|
||||||
|
t2 = '{:02}'.format(centisecs)
|
||||||
|
|
||||||
|
draw.set_font(fonts.sans36)
|
||||||
|
w = fonts.width(fonts.sans36, t1)
|
||||||
|
draw.string(t1, 180-w, 120-36)
|
||||||
|
draw.fill(0, 0, 120-36, 180-w, 36)
|
||||||
|
|
||||||
|
draw.set_font(fonts.sans24)
|
||||||
|
draw.string(t2, 180, 120-36+18, width=46)
|
||||||
|
self._last_count = self._count
|
||||||
|
|
|
@ -4,11 +4,13 @@
|
||||||
freeze('.', 'watch.py', opt=3)
|
freeze('.', 'watch.py', opt=3)
|
||||||
freeze('../..',
|
freeze('../..',
|
||||||
(
|
(
|
||||||
|
'apps/__init__.py',
|
||||||
'apps/clock.py',
|
'apps/clock.py',
|
||||||
'apps/flashlight.py',
|
'apps/flashlight.py',
|
||||||
'apps/launcher.py',
|
'apps/launcher.py',
|
||||||
'apps/pager.py',
|
'apps/pager.py',
|
||||||
'apps/settings.py',
|
'apps/settings.py',
|
||||||
|
'apps/stopwatch.py',
|
||||||
'apps/testapp.py',
|
'apps/testapp.py',
|
||||||
'boot.py',
|
'boot.py',
|
||||||
'demo.py',
|
'demo.py',
|
||||||
|
@ -19,8 +21,10 @@ freeze('../..',
|
||||||
'drivers/signal.py',
|
'drivers/signal.py',
|
||||||
'drivers/st7789.py',
|
'drivers/st7789.py',
|
||||||
'drivers/vibrator.py',
|
'drivers/vibrator.py',
|
||||||
|
'fonts/__init__.py',
|
||||||
'fonts/clock.py',
|
'fonts/clock.py',
|
||||||
'fonts/sans24.py',
|
'fonts/sans24.py',
|
||||||
|
'fonts/sans36.py',
|
||||||
'icons.py',
|
'icons.py',
|
||||||
'logo.py',
|
'logo.py',
|
||||||
'shell.py',
|
'shell.py',
|
||||||
|
|
Loading…
Reference in a new issue