get ntp time and adjust brightness accordingly

camp_pico.py

@@ -10,8 +10,8 @@
 camp_pink = (251, 72, 196)
 camp_green = (63, 255, 33)
 
-# QR code image for "Hello World"
-# size:21x21
+# QR code image for "http://ubabot.frubar.net"
+# size:25x25
 qr_data = [
     [
         (255, 255, 255),
@@ -22,11 +22,15 @@ qr_data = [
         (255, 255, 255),
         (255, 255, 255),
         (0, 0, 0),
-        (0, 0, 0),
+        (255, 255, 255),
         (255, 255, 255),
         (0, 0, 0),
+        (255, 255, 255),
         (0, 0, 0),
         (255, 255, 255),
+        (255, 255, 255),
+        (255, 255, 255),
+        (255, 255, 255),
         (0, 0, 0),
         (255, 255, 255),
         (255, 255, 255),
@@ -45,11 +49,15 @@ qr_data = [
         (0, 0, 0),
         (255, 255, 255),
         (0, 0, 0),
-        (255, 255, 255),
         (0, 0, 0),
-        (255, 255, 255),
+        (0, 0, 0),
+        (0, 0, 0),
+        (0, 0, 0),
+        (0, 0, 0),
+        (0, 0, 0),
         (255, 255, 255),
         (0, 0, 0),
+        (255, 255, 255),
         (0, 0, 0),
         (255, 255, 255),
         (0, 0, 0),
@@ -70,10 +78,14 @@ qr_data = [
         (0, 0, 0),
         (0, 0, 0),
         (255, 255, 255),
+        (255, 255, 255),
+        (255, 255, 255),
+        (255, 255, 255),
         (0, 0, 0),
         (0, 0, 0),
         (255, 255, 255),
         (0, 0, 0),
+        (0, 0, 0),
         (255, 255, 255),
         (0, 0, 0),
         (255, 255, 255),
@@ -91,10 +103,14 @@ qr_data = [
         (0, 0, 0),
         (255, 255, 255),
         (0, 0, 0),
-        (0, 0, 0),
         (255, 255, 255),
         (0, 0, 0),
-        (0, 0, 0),
+        (255, 255, 255),
+        (255, 255, 255),
+        (255, 255, 255),
+        (255, 255, 255),
+        (255, 255, 255),
+        (255, 255, 255),
         (0, 0, 0),
         (0, 0, 0),
         (255, 255, 255),
@@ -115,9 +131,13 @@ qr_data = [
         (255, 255, 255),
         (0, 0, 0),
         (255, 255, 255),
-        (255, 255, 255),
+        (0, 0, 0),
         (255, 255, 255),
         (0, 0, 0),
+        (0, 0, 0),
+        (255, 255, 255),
+        (255, 255, 255),
+        (255, 255, 255),
         (255, 255, 255),
         (0, 0, 0),
         (255, 255, 255),
@@ -137,11 +157,15 @@ qr_data = [
         (0, 0, 0),
         (255, 255, 255),
         (0, 0, 0),
-        (0, 0, 0),
-        (0, 0, 0),
+        (255, 255, 255),
+        (255, 255, 255),
+        (255, 255, 255),
         (255, 255, 255),
         (0, 0, 0),
         (255, 255, 255),
+        (255, 255, 255),
+        (0, 0, 0),
+        (0, 0, 0),
         (0, 0, 0),
         (255, 255, 255),
         (0, 0, 0),
@@ -167,6 +191,10 @@ qr_data = [
         (255, 255, 255),
         (0, 0, 0),
         (255, 255, 255),
+        (0, 0, 0),
+        (255, 255, 255),
+        (0, 0, 0),
+        (255, 255, 255),
         (255, 255, 255),
         (255, 255, 255),
         (255, 255, 255),
@@ -183,10 +211,14 @@ qr_data = [
         (0, 0, 0),
         (0, 0, 0),
         (0, 0, 0),
+        (255, 255, 255),
+        (0, 0, 0),
+        (255, 255, 255),
         (0, 0, 0),
         (255, 255, 255),
         (0, 0, 0),
         (255, 255, 255),
+        (0, 0, 0),
         (255, 255, 255),
         (0, 0, 0),
         (0, 0, 0),
@@ -200,40 +232,72 @@ qr_data = [
     [
         (255, 255, 255),
         (0, 0, 0),
+        (0, 0, 0),
+        (0, 0, 0),
+        (255, 255, 255),
+        (0, 0, 0),
         (255, 255, 255),
+        (255, 255, 255),
+        (255, 255, 255),
+        (255, 255, 255),
+        (0, 0, 0),
         (0, 0, 0),
         (255, 255, 255),
         (0, 0, 0),
+        (0, 0, 0),
+        (0, 0, 0),
+        (255, 255, 255),
+        (255, 255, 255),
+        (255, 255, 255),
+        (255, 255, 255),
+        (255, 255, 255),
         (255, 255, 255),
         (0, 0, 0),
         (0, 0, 0),
         (255, 255, 255),
+    ],
+    [
         (255, 255, 255),
         (255, 255, 255),
         (0, 0, 0),
         (0, 0, 0),
         (0, 0, 0),
+        (255, 255, 255),
+        (0, 0, 0),
+        (255, 255, 255),
+        (255, 255, 255),
+        (255, 255, 255),
+        (0, 0, 0),
+        (255, 255, 255),
+        (255, 255, 255),
+        (255, 255, 255),
         (0, 0, 0),
         (255, 255, 255),
+        (255, 255, 255),
+        (0, 0, 0),
         (0, 0, 0),
         (0, 0, 0),
         (255, 255, 255),
+        (255, 255, 255),
+        (0, 0, 0),
+        (255, 255, 255),
         (0, 0, 0),
     ],
     [
         (0, 0, 0),
+        (0, 0, 0),
+        (0, 0, 0),
         (255, 255, 255),
         (0, 0, 0),
         (255, 255, 255),
         (255, 255, 255),
         (0, 0, 0),
+        (255, 255, 255),
         (0, 0, 0),
         (255, 255, 255),
         (255, 255, 255),
         (0, 0, 0),
-        (0, 0, 0),
-        (0, 0, 0),
-        (0, 0, 0),
+        (255, 255, 255),
         (0, 0, 0),
         (255, 255, 255),
         (255, 255, 255),
@@ -242,36 +306,77 @@ qr_data = [
         (0, 0, 0),
         (255, 255, 255),
         (255, 255, 255),
+        (255, 255, 255),
+        (0, 0, 0),
+        (0, 0, 0),
     ],
     [
+        (255, 255, 255),
+        (255, 255, 255),
+        (0, 0, 0),
+        (0, 0, 0),
+        (0, 0, 0),
+        (255, 255, 255),
+        (0, 0, 0),
+        (0, 0, 0),
+        (0, 0, 0),
         (0, 0, 0),
         (255, 255, 255),
+        (255, 255, 255),
+        (0, 0, 0),
+        (0, 0, 0),
+        (0, 0, 0),
+        (0, 0, 0),
+        (0, 0, 0),
         (0, 0, 0),
         (0, 0, 0),
         (0, 0, 0),
         (0, 0, 0),
+        (0, 0, 0),
+        (255, 255, 255),
         (255, 255, 255),
+        (0, 0, 0),
+    ],
+    [
         (255, 255, 255),
+        (0, 0, 0),
         (255, 255, 255),
         (0, 0, 0),
+        (0, 0, 0),
+        (0, 0, 0),
         (255, 255, 255),
         (0, 0, 0),
+        (0, 0, 0),
+        (0, 0, 0),
+        (0, 0, 0),
         (255, 255, 255),
+        (0, 0, 0),
+        (0, 0, 0),
         (255, 255, 255),
         (0, 0, 0),
+        (0, 0, 0),
         (255, 255, 255),
         (255, 255, 255),
         (255, 255, 255),
+        (0, 0, 0),
+        (255, 255, 255),
         (255, 255, 255),
         (255, 255, 255),
         (255, 255, 255),
     ],
     [
+        (255, 255, 255),
+        (255, 255, 255),
         (0, 0, 0),
+        (0, 0, 0),
+        (255, 255, 255),
         (255, 255, 255),
+        (0, 0, 0),
         (255, 255, 255),
         (0, 0, 0),
         (255, 255, 255),
+        (0, 0, 0),
+        (0, 0, 0),
         (255, 255, 255),
         (0, 0, 0),
         (255, 255, 255),
@@ -280,35 +385,90 @@ qr_data = [
         (0, 0, 0),
         (0, 0, 0),
         (0, 0, 0),
+        (255, 255, 255),
+        (0, 0, 0),
+        (0, 0, 0),
+        (255, 255, 255),
+        (0, 0, 0),
+    ],
+    [
+        (0, 0, 0),
+        (0, 0, 0),
+        (255, 255, 255),
+        (255, 255, 255),
+        (255, 255, 255),
+        (0, 0, 0),
+        (255, 255, 255),
+        (255, 255, 255),
         (0, 0, 0),
         (0, 0, 0),
         (0, 0, 0),
         (255, 255, 255),
+        (255, 255, 255),
+        (255, 255, 255),
+        (255, 255, 255),
+        (255, 255, 255),
+        (255, 255, 255),
+        (255, 255, 255),
         (0, 0, 0),
+        (255, 255, 255),
         (0, 0, 0),
         (255, 255, 255),
+        (255, 255, 255),
+        (0, 0, 0),
         (0, 0, 0),
     ],
     [
         (0, 0, 0),
+        (0, 0, 0),
+        (0, 0, 0),
+        (0, 0, 0),
         (255, 255, 255),
         (0, 0, 0),
+        (0, 0, 0),
+        (0, 0, 0),
         (255, 255, 255),
         (255, 255, 255),
         (0, 0, 0),
         (255, 255, 255),
         (0, 0, 0),
+        (0, 0, 0),
+        (0, 0, 0),
+        (0, 0, 0),
+        (0, 0, 0),
+        (255, 255, 255),
+        (255, 255, 255),
+        (255, 255, 255),
+        (0, 0, 0),
         (255, 255, 255),
         (255, 255, 255),
         (255, 255, 255),
         (0, 0, 0),
+    ],
+    [
         (255, 255, 255),
         (255, 255, 255),
         (0, 0, 0),
+        (0, 0, 0),
+        (0, 0, 0),
+        (0, 0, 0),
+        (255, 255, 255),
+        (0, 0, 0),
+        (0, 0, 0),
         (255, 255, 255),
         (255, 255, 255),
         (0, 0, 0),
+        (255, 255, 255),
+        (0, 0, 0),
         (0, 0, 0),
+        (255, 255, 255),
+        (255, 255, 255),
+        (255, 255, 255),
+        (255, 255, 255),
+        (255, 255, 255),
+        (255, 255, 255),
+        (255, 255, 255),
+        (255, 255, 255),
         (0, 0, 0),
         (0, 0, 0),
     ],
@@ -322,18 +482,22 @@ qr_data = [
         (0, 0, 0),
         (0, 0, 0),
         (255, 255, 255),
-        (0, 0, 0),
         (255, 255, 255),
         (255, 255, 255),
         (0, 0, 0),
+        (0, 0, 0),
+        (0, 0, 0),
         (255, 255, 255),
         (0, 0, 0),
+        (255, 255, 255),
         (0, 0, 0),
         (0, 0, 0),
         (0, 0, 0),
         (255, 255, 255),
+        (0, 0, 0),
         (255, 255, 255),
         (0, 0, 0),
+        (0, 0, 0),
     ],
     [
         (255, 255, 255),
@@ -344,19 +508,23 @@ qr_data = [
         (255, 255, 255),
         (255, 255, 255),
         (0, 0, 0),
-        (0, 0, 0),
-        (255, 255, 255),
-        (255, 255, 255),
         (255, 255, 255),
         (0, 0, 0),
+        (255, 255, 255),
         (0, 0, 0),
         (0, 0, 0),
         (255, 255, 255),
         (255, 255, 255),
         (0, 0, 0),
         (255, 255, 255),
+        (0, 0, 0),
+        (255, 255, 255),
+        (0, 0, 0),
         (255, 255, 255),
         (255, 255, 255),
+        (0, 0, 0),
+        (0, 0, 0),
+        (0, 0, 0),
     ],
     [
         (255, 255, 255),
@@ -369,17 +537,21 @@ qr_data = [
         (0, 0, 0),
         (0, 0, 0),
         (0, 0, 0),
-        (0, 0, 0),
         (255, 255, 255),
+        (0, 0, 0),
         (255, 255, 255),
         (0, 0, 0),
         (0, 0, 0),
         (255, 255, 255),
+        (255, 255, 255),
         (0, 0, 0),
         (0, 0, 0),
         (0, 0, 0),
-        (0, 0, 0),
         (255, 255, 255),
+        (255, 255, 255),
+        (255, 255, 255),
+        (255, 255, 255),
+        (0, 0, 0),
     ],
     [
         (255, 255, 255),
@@ -394,13 +566,17 @@ qr_data = [
         (255, 255, 255),
         (255, 255, 255),
         (255, 255, 255),
-        (0, 0, 0),
+        (255, 255, 255),
         (0, 0, 0),
         (0, 0, 0),
         (0, 0, 0),
         (255, 255, 255),
+        (255, 255, 255),
+        (255, 255, 255),
+        (255, 255, 255),
+        (255, 255, 255),
         (0, 0, 0),
-        (0, 0, 0),
+        (255, 255, 255),
         (0, 0, 0),
         (0, 0, 0),
     ],
@@ -416,16 +592,20 @@ qr_data = [
         (0, 0, 0),
         (255, 255, 255),
         (255, 255, 255),
-        (255, 255, 255),
-        (0, 0, 0),
         (0, 0, 0),
         (255, 255, 255),
         (255, 255, 255),
         (255, 255, 255),
         (0, 0, 0),
+        (0, 0, 0),
         (255, 255, 255),
         (255, 255, 255),
         (0, 0, 0),
+        (0, 0, 0),
+        (255, 255, 255),
+        (255, 255, 255),
+        (255, 255, 255),
+        (255, 255, 255),
     ],
     [
         (255, 255, 255),
@@ -436,19 +616,23 @@ qr_data = [
         (0, 0, 0),
         (255, 255, 255),
         (0, 0, 0),
-        (255, 255, 255),
         (0, 0, 0),
         (255, 255, 255),
-        (0, 0, 0),
         (255, 255, 255),
-        (0, 0, 0),
         (255, 255, 255),
         (0, 0, 0),
+        (0, 0, 0),
         (255, 255, 255),
         (0, 0, 0),
         (255, 255, 255),
+        (255, 255, 255),
+        (255, 255, 255),
+        (255, 255, 255),
+        (0, 0, 0),
+        (0, 0, 0),
         (0, 0, 0),
         (255, 255, 255),
+        (0, 0, 0),
     ],
     [
         (255, 255, 255),
@@ -461,15 +645,19 @@ qr_data = [
         (0, 0, 0),
         (0, 0, 0),
         (0, 0, 0),
+        (0, 0, 0),
         (255, 255, 255),
         (255, 255, 255),
         (0, 0, 0),
+        (255, 255, 255),
         (0, 0, 0),
         (0, 0, 0),
         (0, 0, 0),
         (255, 255, 255),
-        (0, 0, 0),
-        (0, 0, 0),
+        (255, 255, 255),
+        (255, 255, 255),
+        (255, 255, 255),
+        (255, 255, 255),
         (255, 255, 255),
         (0, 0, 0),
     ],
@@ -483,16 +671,20 @@ qr_data = [
         (255, 255, 255),
         (0, 0, 0),
         (255, 255, 255),
-        (255, 255, 255),
         (0, 0, 0),
-        (255, 255, 255),
-        (255, 255, 255),
         (0, 0, 0),
         (0, 0, 0),
+        (0, 0, 0),
+        (0, 0, 0),
+        (0, 0, 0),
+        (255, 255, 255),
+        (0, 0, 0),
         (255, 255, 255),
         (0, 0, 0),
         (0, 0, 0),
         (0, 0, 0),
+        (0, 0, 0),
+        (255, 255, 255),
         (255, 255, 255),
         (255, 255, 255),
     ],
@@ -504,17 +696,47 @@ if True:#__name__ == "__main__":
     from net import CheckHTTP
     from qr import QRScreen
     from scroll import ScrollText
+    from splash import SplashScreen
     from manager import Manager
 
+    #url = "http://ubabot.frubar.net"
+    url = "http://xythobuz.de"
+
     import util
     t = util.getTarget()
 
+    # Loading fonts and graphics takes a while.
+    # So show a splash screen while the user waits.
+    splash = SplashScreen(t)
+    t.loop_start()
+    splash.draw()
+    t.loop_end()
+
+    # UbaBot is online
+    success = Manager(t)
+    success.add(ScrollText(t, "Visit UbaBot Cocktail machine at FruBar village for drinks!", "bitmap8", 1, 10, camp_pink))
+    success.add(Solid(t, 1.0))
+    success.add(QRScreen(t, qr_data, 30.0, "Drinks", "bitmap6", (255, 255, 255), (0, 0, 0)))
+    success.add(Solid(t, 1.0))
+
+    # UbaBot is offline
+    fail = Manager(t)
+    fail.add(ScrollText(t, "The UbaBot Cocktail machine is closed. Please come back later!", "bitmap8", 1, 10, camp_pink))
+    fail.add(Solid(t, 1.0))
+    fail.add(GameOfLife(t, 20, (0, 255, 0), (0, 0, 0), None, 2.0))
+    fail.add(Solid(t, 1.0))
+
+    # UbaBot status checker
+    d = CheckHTTP(url)
+    d.success(success)
+    d.fail(fail)
+
     # Main "Menu"
     m = Manager(t)
     m.add(ScrollText(t, "#CCCAMP23", "bitmap8", 1, 10, camp_green))
     m.add(Solid(t, 1.0))
-    #m.add(QRScreen(t, qr_data, 30.0, "Drinks:", "bitmap8", (255, 255, 255), (0, 0, 0)))
-    #m.add(Solid(t, 1.0))
+    m.add(d) # HTTP Check, either "success" or "fail"
+    m.add(Solid(t, 1.0))
 
     m.restart()
     t.loop(m.draw)

copy.sh

@@ -6,6 +6,7 @@ cp config.py /pyboard
 cp pico.py /pyboard
 cp util.py /pyboard
 cp manager.py /pyboard
+cp mapper.py /pyboard
 cp net.py /pyboard
 cp solid.py /pyboard
 cp splash.py /pyboard
@@ -22,6 +23,7 @@ cp config.py /pyboard
 cp pico.py /pyboard
 cp util.py /pyboard
 cp manager.py /pyboard
+cp mapper.py /pyboard
 cp net.py /pyboard
 cp solid.py /pyboard
 cp splash.py /pyboard

image.py

@@ -68,8 +68,9 @@ class ImageScreen:
 
     def draw(self):
         if self.image.is_animated:
-            if (time.time() - self.frame) >= self.time:
-                self.frame = time.time()
+            now = time.time()
+            if (now - self.frame) >= self.time:
+                self.frame = now
                 self.count = (self.count + 1) % self.image.n_frames
                 if self.count == 0:
                     self.done += 1

life.py

@@ -122,13 +122,15 @@ class GameOfLife:
         self.lastDiff = diff
 
     def draw(self):
-        if (time.time() - self.last) > self.interval:
-            self.last = time.time()
+        now = time.time()
+        if (now - self.last) > self.interval:
+            self.last = now
             self.step()
 
         if (self.randomizeColors != None) and (self.randomizeColors != True):
-            if (time.time() - self.lastColor) > self.randomizeColors:
-                self.lastColor = time.time()
+            now = time.time()
+            if (now - self.lastColor) > self.randomizeColors:
+                self.lastColor = now
                 self.randomize()
 
         for x in range(0, self.gui.width):

manager.py

@@ -41,8 +41,9 @@ class Manager:
                 self.screens[self.index][0].restart()
         else:
             # use given timeout
-            if (time.time() - self.lastTime) > self.screens[self.index][1]:
-                self.lastTime = time.time()
+            now = time.time()
+            if ((now - self.lastTime) > self.screens[self.index][1]) or (now < self.lastTime):
+                self.lastTime = now
                 self.index = (self.index + 1) % len(self.screens)
                 self.done = (self.index == 0)
                 self.screens[self.index][0].restart()

mapper.py

@@ -7,6 +7,17 @@
 # think this stuff is worth it, you can buy me a beer in return.   Thomas Buck
 # ----------------------------------------------------------------------------
 
+import util
+import time
+import sys
+
+useNTP = False
+try:
+    import ntptime
+    useNTP = True
+except:
+    pass
+
 # Does nothing. Take this as parent for new mappers.
 class MapperNull:
     def __init__(self, g):
@@ -17,6 +28,9 @@ class MapperNull:
         self.panelW = self.gui.panelW
         self.panelH = self.gui.panelH
 
+        if hasattr(self.gui, "matrix"):
+            self.matrix = self.gui.matrix
+
     def loop_start(self):
         return self.gui.loop_start()
 
@@ -69,3 +83,70 @@ class MapperStripToRect(MapperNull):
             y -= self.panelH
 
         self.gui.set_pixel(x, y, color)
+
+# Fetches current time via NTP.
+# System time will be in UTC afterwards, not with local time-zone
+# offset like when using rshell (eg. when using with a Pico).
+#
+# Brightness of display will be adjusted according to current time.
+# To avoid being too bright at night.
+#
+# When used with the Interstate75 Pico implementation,
+# this needs to be the "first" element of the mapper chain.
+# Otherwise special handling for PicoText will not work.
+class MapperReduceBrightness(MapperNull):
+    def __init__(self, g):
+        super().__init__(g)
+        self.last = None
+        self.connected = False
+        self.refresh = 60 * 60 * 6
+        self.factor = 1.0
+
+    def fetch(self):
+        self.factor = 1.0
+
+        if not useNTP:
+            return
+
+        if not self.connected:
+            self.connected = util.connectToWiFi()
+
+        if self.connected:
+            now = time.time()
+            if (self.last == None) or ((now - self.last) >= self.refresh) or (now < self.last):
+                self.last = now
+
+                try:
+                    print("Before sync： " + str(time.localtime()))
+                    ntptime.settime()
+                    print("After sync： "  + str(time.localtime()))
+                except Exception as e:
+                    print()
+                    sys.print_exception(e)
+                    print()
+                    return
+
+        # (year, month, day, hour, minute, second, ?, ?)
+        now = time.localtime()
+
+        # 8pm utc == 22pm dst germany
+        night = (now[0], now[1], now[2], 20, 0, 0, 0, 0)
+
+        # 5am utc == 7am dst germany
+        morning = (now[0], now[1], now[2], 5, 0, 0, 0, 0)
+
+        if (now > morning) and (now < night):
+            self.factor = 1.0
+        else:
+            self.factor = 0.25
+
+    def adjust(self, color):
+        return (int(color[0] * self.factor), int(color[1] * self.factor), int(color[2] * self.factor))
+
+    def loop_end(self):
+        super().loop_end()
+        self.fetch()
+
+    def set_pixel(self, x, y, color):
+        color = self.adjust(color)
+        self.gui.set_pixel(x, y, color)

net.py

@@ -9,6 +9,7 @@
 
 import time
 import util
+import sys
 
 class CheckHTTP:
     def __init__(self, u, r = 600.0):
@@ -16,6 +17,7 @@ class CheckHTTP:
         self.refresh = r
         self.successScreen = None
         self.failScreen = None
+        self.response = None
         self.get = util.getRequests()
 
         self.restart()
@@ -28,7 +30,12 @@ class CheckHTTP:
 
     def restart(self):
         self.start = time.time()
-        self.response = None
+
+        # when set to None here, manager will cause re-request every time
+        # we don't do it, caching the response for the full refresh time.
+        # this assumes the URL never changes, of course.
+        #self.response = None
+
         self.request()
 
         if self.successScreen != None:
@@ -40,12 +47,19 @@ class CheckHTTP:
         if self.get == None:
             return
 
-        if (self.response == None) or ((time.time() - self.start) >= self.refresh):
-            self.start = time.time()
+        now = time.time()
+        if (self.response == None) or ((now - self.start) >= self.refresh):
+            self.start = now
             try:
+                print("Refreshing " + self.url)
                 r = self.get(self.url)
+                r.close()
+                print("Response: " + str(r.status_code))
                 self.response = (r.status_code < 400)
-            except:
+            except Exception as e:
+                print()
+                sys.print_exception(e)
+                print()
                 self.response = False
 
     def finished(self):

pico.py

@@ -11,6 +11,9 @@
 # ----------------------------------------------------------------------------
 
 import interstate75
+from mapper import MapperReduceBrightness
+import time
+from machine import Pin
 
 class PicoMatrix:
     def __init__(self, w = 32, h = 32):
@@ -26,11 +29,15 @@ class PicoMatrix:
         if (w != 32) or (h != 32):
             raise RuntimeError("TODO not yet supported")
 
-        self.matrix = interstate75.Interstate75(display = interstate75.DISPLAY_INTERSTATE75_32X32)
+        mode = interstate75.DISPLAY_INTERSTATE75_32X32
+        self.matrix = interstate75.Interstate75(display = mode)
 
         self.black = self.matrix.display.create_pen(0, 0, 0)
         self.white = self.matrix.display.create_pen(255, 255, 255)
 
+        self.ledTime = time.time()
+        self.led = Pin("LED", Pin.OUT)
+
         self.loop_start() # initialize with blank image for ScrollText constructor
 
     def loop_start(self):
@@ -47,9 +54,17 @@ class PicoMatrix:
         while True:
             if self.loop_start():
                 break
+
             if func != None:
                 func()
+
             self.loop_end()
+
+            now = time.time()
+            if ((now - self.ledTime) >= 0.5) or (now < self.ledTime):
+                self.ledTime = now
+                self.led.toggle()
+
         self.matrix.stop()
 
     def set_pixel(self, x, y, color):
@@ -72,7 +87,11 @@ class PicoText:
         if not earlyAbort:
             return self.gui.matrix.display.measure_text(s, scale=1)
 
-        pen = self.gui.matrix.display.create_pen(self.fg[0], self.fg[1], self.fg[2])
+        color = self.fg
+        if isinstance(self.gui, MapperReduceBrightness):
+            color = self.gui.adjust(color)
+
+        pen = self.gui.matrix.display.create_pen(color[0], color[1], color[2])
         self.gui.matrix.display.set_pen(pen)
 
         self.gui.matrix.display.set_font(f)
@@ -107,8 +126,9 @@ if __name__ == "__main__":
     def helper():
         global s, start, i
 
-        if (time.time() - start) > 2.0:
-            start = time.time()
+        now = time.time()
+        if ((now - start) > 2.0) or (now < start):
+            start = now
             i = (i + 1) % 2
 
         if i == 0:

qr.py

@@ -91,7 +91,11 @@ class QRScreen:
                     self.gui.set_pixel(x + self.xOff + self.image.width, y + self.yOff, self.c2)
 
         if self.heading != None:
-            self.text.text(self.heading, self.font, 0, True, -10)
+            off = -10
+            if self.font == "bitmap6":
+                off -= 3
+
+            self.text.text(self.heading, self.font, 0, True, off)
 
         for x in range(0, self.image.width):
             for y in range(0, self.image.height):
@@ -106,7 +110,7 @@ if __name__ == "__main__":
 
     t = util.getTarget()
 
-    d = QRScreen(t, "Hello World", 10.0, "Drinks:", "tom-thumb", (255, 255, 255), (0, 0, 0))
+    d = QRScreen(t, "http://ubabot.frubar.net", 10.0, "Drinks:", "tom-thumb", (255, 255, 255), (0, 0, 0))
 
     # dump generated QR image to console, for embedding in Pico script
     print("Dumping QR image to qr_tmp.txt")

scroll.py

@@ -33,7 +33,6 @@ class ScrollText:
         self.text = t
         self.font = f
         self.width = self.drawer.text(self.text, self.font, 0, False)
-        print(self.text, self.font, self.width)
 
     def restart(self):
         self.offset = -self.gui.width
@@ -44,11 +43,11 @@ class ScrollText:
         return (self.count >= self.iterations)
 
     def draw(self):
-        if (time.time() - self.last) > self.speed:
-            off = (time.time() - self.last) / self.speed
-            print(self.offset, "->", self.offset + int(off))
+        now = time.time()
+        if (now - self.last) > self.speed:
+            off = (now - self.last) / self.speed
             self.offset += int(off)
-            self.last = time.time()
+            self.last = now
             if self.offset >= self.width:
                 self.offset = -self.gui.width
                 self.count += 1

snake.py

@@ -136,8 +136,9 @@ class Snake:
             # TODO "AI"
             pass
 
-        if (time.time() - self.last) >= self.timestep:
-            self.last = time.time()
+        now = time.time()
+        if (now - self.last) >= self.timestep:
+            self.last = now
 
             # only allow valid inputs
             tmp = self.direction + self.directionTmp

solid.py

@@ -23,7 +23,8 @@ class Solid:
         self.start = time.time()
 
     def finished(self):
-        return (time.time() - self.start) >= self.time
+        now = time.time()
+        return ((now - self.start) >= self.time) or (now < self.start)
 
     def draw(self):
         for x in range(0, self.gui.width):
@@ -55,8 +56,9 @@ if __name__ == "__main__":
     def helper():
         global s, colors, ci, n, c
 
-        if (time.time() - s) >= 0.1:
-            s = time.time()
+        now = time.time()
+        if ((now - s) >= 0.1) or (now < s):
+            s = now
             n += 1
             if n >= 15:
                 ci = (ci + 1) % len(colors)

tetris.py

@@ -243,8 +243,9 @@ class Tetris:
             # TODO "AI"
             self.button = None
 
-        if (self.button != None) or ((time.time() - self.last) >= self.timestep):
-            self.last = time.time()
+        now = time.time()
+        if (self.button != None) or ((now - self.last) >= self.timestep) or (now < self.last):
+            self.last = now
             cont = self.step()
             if cont == False:
                 self.done = True

util.py

@@ -7,7 +7,10 @@
 # think this stuff is worth it, you can buy me a beer in return.   Thomas Buck
 # ----------------------------------------------------------------------------
 
+import sys
+
 targetPlatform = None
+wifiConnected = False
 
 def isPi():
     global targetPlatform
@@ -43,17 +46,29 @@ def getTarget():
             # only print once
             print("Raspberry Pi Adafruit RGB LED Matrix detected")
         targetPlatform = "pi"
-    except:
+    except Exception as e:
+        print()
+        sys.print_exception(e)
+        print()
+
         try:
             # Next we try the Pico Interstate75 interface
             from pico import PicoMatrix
-            target = PicoMatrix()
+            pico = PicoMatrix()
+
+            # TODO hard-coded adjustments
+            from mapper import MapperReduceBrightness
+            target = MapperReduceBrightness(pico)
 
             if targetPlatform == None:
                 # only print once
                 print("Raspberry Pi Pico Interstate75 RGB LED Matrix detected")
             targetPlatform = "pico"
-        except:
+        except Exception as e:
+            print()
+            sys.print_exception(e)
+            print()
+
             # If this fails fall back to the SDL/pygame GUI
             from test import TestGUI
             target = TestGUI()
@@ -67,6 +82,21 @@ def getTarget():
 
 # https://github.com/raspberrypi/pico-examples/blob/master/pico_w/wifi/python_test_tcp/micropython_test_tcp_client.py
 def connectToWiFi():
+    global wifiConnected
+
+    if wifiConnected:
+        return True
+
+    # only use WiFi on Pico
+    try:
+        from pico import PicoMatrix
+    except Exception as e:
+        print()
+        sys.print_exception(e)
+        print()
+        wifiConnected = True
+        return True
+
     import network
     import time
     from config import Config
@@ -74,6 +104,7 @@ def connectToWiFi():
     # Check if wifi details have been set
     if len(Config.networks) == 0:
         print('Please set wifi ssid and password in config.py')
+        wifiConnected = False
         return False
 
     # Start WiFi hardware
@@ -92,14 +123,15 @@ def connectToWiFi():
                 break
     if (ssid == None) or (password == None):
         print("No known network found")
+        wifiConnected = False
         return False
 
     # Start connection
     wlan.connect(ssid, password)
 
     # Wait for connect success or failure
-    max_wait = 20
-    error_count = 20
+    max_wait = 40
+    error_count = max_wait
     while max_wait > 0:
         if wlan.status() >= 3:
             break
@@ -116,26 +148,35 @@ def connectToWiFi():
     # Handle connection error
     if wlan.status() != 3:
         print('wifi connection failed %d' % wlan.status())
+        wifiConnected = False
         return False
     else:
         print('connected')
         status = wlan.ifconfig()
         print('ip = ' + status[0])
 
+    wifiConnected = True
     return True
 
 def getRequests():
+    global wifiConnected
+
     try:
         # try to get normal python lib
         import requests
         return requests.get
-    except:
+    except Exception as e:
+        print()
+        sys.print_exception(e)
+        print()
+
         # if it fails try the Pi Pico MicroPython implementation
         import urequests as requests
 
         # in this case we also need to connect to WiFi first
-        if not connectToWiFi():
-            return None
+        if not wifiConnected:
+            if not connectToWiFi():
+                return None
 
         return requests.get
 
@@ -146,7 +187,11 @@ def getTextDrawer():
         # Try BDF parser library
         from bdf import DrawText
         return DrawText
-    except:
+    except Exception as e:
+        print()
+        sys.print_exception(e)
+        print()
+
         # fall back to the Pico Interstate75 implementation
         from pico import PicoText
         return PicoText