testapp: Show the render time for the string test

2 files changed, 29 insertions, 1 deletions

diff --git a/wasp/apps/testapp.py b/wasp/apps/testapp.py
index f5d4de5..b711722 100644
--- a/wasp/apps/testapp.py
+++ b/wasp/apps/testapp.py
@@ -1,6 +1,7 @@
 import watch
 import widgets
 import manager
+import machine
 
 from draw565 import Draw565
 
@@ -38,14 +39,20 @@ class TestApp():
         draw = self.drawable
         if self.test == 'Touch':
             draw.string('({}, {})'.format(event[1], event[2]),
-                    0, 180, width=240)
+                    0, 108, width=240)
         elif self.test == 'String':
             watch.display.fill(0, 0, 30, 240, 240-30)
+            t = machine.Timer(id=1, period=8000000)
+            t.start()
             draw.string("The quick brown", 12, 24+24)
             draw.string("fox jumped over", 12, 24+48)
             draw.string("the lazy dog.", 12, 24+72)
             draw.string("0123456789", 12, 24+120)
             draw.string('!"£$%^&*()', 12, 24+144)
+            elapsed = t.time()
+            t.stop()
+            del t
+            draw.string('{}s'.format(elapsed / 1000000), 12, 24+192)
 
         return True
 
diff --git a/wasp/boards/simulator/machine.py b/wasp/boards/simulator/machine.py
index dd462bb..62a95c5 100644
--- a/wasp/boards/simulator/machine.py
+++ b/wasp/boards/simulator/machine.py
@@ -82,6 +82,27 @@ class I2C():
         else:
             raise OSError
 
+class Timer():
+    def __init__(self, id, period=1000000):
+        self.then = None
+        self.period = period
+
+    def start(self):
+        self.then = time.time()
+
+    def stop(self):
+        self.then = None
+
+    def time(self):
+        now = time.time()
+        elapsed_sec = now - self.then
+        elapsed_us = int(elapsed_sec * 1000000)
+
+        return elapsed_us % self.period
+
+    def period(self):
+        self.time()
+
 def lightsleep(ms=10):
     display.tick()
     time.sleep(ms / 1000)