some old uncommited changes

README.md

@@ -18,6 +18,17 @@ You always need:
 
 For evdev to find all devices you may need to add your user to the `input` group or run the scripts as root.
 
+To install wetterdienst on a Raspberry Pi 4 you first need to [get a Rust toolchain](https://rustup.rs/) (install it for root, because the visualizer has to run as root as well):
+
+    sudo su
+    curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh
+    # select arm-unknown-linux-gnueabihf manually
+    apt-get install gfortran libopenblas-base libopenblas-dev libatlas-base-dev python3-lxml python3-scipy python3-numpy python3-venv
+    python -m venv venv
+    source venv/bin/activate
+
+    pip install wetterdienst>=0.59.1 polars
+
 The rest depends on the output device chosen.
 For debugging on your host PC you can use the TestGUI interface with pygame:
 

apod.py

@@ -17,11 +17,12 @@ import util
 from image import ImageScreen
 
 class APOD:
-    def __init__(self, g, i, to = 10.0, r = 6 * 60 * 60):
+    def __init__(self, g, i, to = 10.0, r = 6 * 60 * 60, ito = 30.0):
         self.gui = g
         self.input = i
         self.timeout = to
         self.refresh = r
+        self.input_timeout = ito
 
         self.get = None
         self.path = "https://apod.nasa.gov/apod"
@@ -31,11 +32,11 @@ class APOD:
         self.last = None
         self.restart()
 
-    def restart(self):
+    def reloadImage(self):
         if (self.last == None) or ((time.time() - self.last) >= self.refresh):
             try:
                 print("APOD refresh")
-                self.img_url = self.get_image_path()
+                self.img_url, self.img_desc = self.get_image_metadata()
                 self.img_path = self.download_image(self.img_url)
                 self.image = ImageScreen(self.gui, self.img_path, 0.2, 1, 5.0, None, None, False)
                 self.last = time.time()
@@ -47,10 +48,28 @@ class APOD:
                     print(e)
                 print()
 
+    def restart(self):
+        self.reloadImage()
+        self.old_keys = self.input.empty() # TODO support missing input
+        self.lastInput = None
+        self.drawingText = False
         self.show = time.time()
 
     def finished(self):
-        return (self.image == None) or ((time.time() - self.show) >= self.timeout)
+        if self.lastInput == None:
+            # skip when no image could be loaded
+            if self.image == None:
+                return True
+
+            # 10s show image timeout when no buttons have been pressed
+            if (time.time() - self.show) >= self.timeout:
+                return True
+        else:
+            # 30s button input timeout after last button press
+            if (time.time() - self.lastInput) >= self.input_timeout:
+                return True
+
+        return False
 
     def fetch(self, url):
         # lazily initialize WiFi
@@ -85,40 +104,78 @@ class APOD:
             print()
             return None
 
-    def get_image_path(self, path = ""):
-        print("Checking for new APOD")
+    def get_image_metadata(self, path = ""):
+        if len(path) == 0:
+            print("Checking for new APOD")
+        else:
+            print("Checking out APOD '{}'".format(path))
+
+        imgPath = None
+        imgDesc = None
+
         r = self.fetch(self.path + "/" + path).text
         for line in r.splitlines():
             start = line.find('IMG SRC="')
-            if start < 0:
-                continue
-            start += 9
-            end = line.find('"', start)
-            img = line[start : end]
-            return self.path + "/" + img
-        return None
+            if start >= 0:
+                start += 9
+                end = line.find('"', start)
+                img = line[start : end]
+                imgPath = self.path + "/" + img
+                break # TODO also check for description
+
+        return imgPath, imgDesc
 
     def download_image(self, path):
         print("Loading " + path)
         r = self.fetch(path).content
+
         scriptDir = os.path.dirname(os.path.realpath(__file__))
         imageDir = os.path.join(scriptDir, "images")
         imagePath = os.path.join(imageDir, "apod_" + os.path.basename(path))
+
         if os.path.isfile(imagePath):
             print("Image already loaded. Skip.")
             return imagePath
+
         print("Storing at " + imagePath)
         with open(imagePath, 'wb') as f:
             f.write(r)
+
         return imagePath
 
+    def buttons(self):
+        keys = self.input.get()
+
+        if keys["up"] and (not self.old_keys["up"]) and (not self.old_keys["select"]):
+            pass # TODO next picture
+        elif keys["down"] and (not self.old_keys["down"]) and (not self.old_keys["select"]):
+            pass # TODO previous picture
+        elif keys["a"] and (not self.old_keys["a"]):
+            self.drawingText = True
+        elif (keys["select"] and keys["start"] and (not self.old_keys["start"])) or (keys["start"] and keys["select"] and (not self.old_keys["select"])):
+            self.restart()
+
+        self.old_keys = keys.copy()
+
     def draw(self):
-        if self.image != None:
-            self.image.draw()
+        if self.input != None:
+            self.buttons()
+
+        if self.drawingText:
+            pass # TODO
+        else:
+            if self.image != None:
+                self.image.draw()
 
 if __name__ == "__main__":
     i = util.getInput()
     t = util.getTarget(i)
 
     s = APOD(t, i)
-    util.loop(t, s.draw)
+
+    def helper():
+        s.draw()
+        if s.finished():
+            s.restart()
+
+    util.loop(t, helper)

games.py

@@ -22,6 +22,7 @@ from gamepad import InputWrapper
 from manager import Manager
 from tetris import Tetris
 from breakout import Breakout
+from runner import TunnelRun
 import util
 
 url_uba = "http://ubabot.frubar.net"
@@ -42,6 +43,8 @@ t.loop_end()
 
 # Main "Menu"
 m = Manager(t, i)
+m.add(TunnelRun(t, i))
+m.add(Solid(t, 1.0))
 m.add(Breakout(t, i))
 m.add(Solid(t, 1.0))
 m.add(GameOfLife(t, 20, (0, 255, 0), (0, 0, 0), None, 2.0))

mapper.py

@@ -150,11 +150,11 @@ class MapperReduceBrightness(MapperNull):
             # 6am utc == 8am cest germany
             morning = (now[0], now[1], now[2], 6, 0, 0, 0, 0)
         else:
-            # 8pm cest germany
-            evening = (now[0], now[1], now[2], 20, 0, 0, 0, 0)
+            # 6pm cest germany
+            evening = (now[0], now[1], now[2], 18, 0, 0, 0, 0)
 
-            # 2am cest germany
-            night = (now[0], now[1], now[2], 2, 0, 0, 0, 0)
+            # 1am cest germany
+            night = (now[0], now[1], now[2], 1, 0, 0, 0, 0)
 
             # 8am cest germany
             morning = (now[0], now[1], now[2], 8, 0, 0, 0, 0)