gol faster and random colors. remove broken weather tests.

draw.py

@@ -85,13 +85,12 @@ class ScrollText:
 
     def draw(self):
         if (time.time() - self.last) > self.speed:
+            self.last = time.time()
             self.offset = (self.offset + 1)
             if self.offset >= self.width:
                 self.offset = -self.gui.width
                 self.count += 1
 
-            self.last = time.time()
-
         self.drawer.text(self.text, self.offset)
 
 if __name__ == "__main__":

life.py

@@ -4,11 +4,10 @@ import time
 import random
 
 class GameOfLife:
-    def __init__(self, g, f = 20, c1 = (255, 255, 255), c2 = (0, 0, 0), t = 30.0):
+    def __init__(self, g, f = 20, c1 = (255, 255, 255), c2 = (0, 0, 0), t = 20.0):
         self.gui = g
         self.interval = 1.0 / f
-        self.colorFG = c1
-        self.colorBG = c2
+        self.setColors(c1, c2)
         self.timeout = t
         random.seed()
         self.restart()
@@ -19,6 +18,10 @@ class GameOfLife:
         self.last = time.time()
         self.done = False
 
+    def setColors(self, c1, c2):
+        self.colorFG = c1
+        self.colorBG = c2
+
     def init(self):
         data = []
         for x in range(0, self.gui.width):
@@ -80,8 +83,8 @@ class GameOfLife:
 
     def draw(self):
         if (time.time() - self.last) > self.interval:
-            self.step()
             self.last = time.time()
+            self.step()
 
         for x in range(0, self.gui.width):
             for y in range(0, self.gui.height):
@@ -102,9 +105,17 @@ if __name__ == "__main__":
 
     g = GameOfLife(t)
 
+    def helperRestart():
+        c = (random.randrange(0, 256), random.randrange(0, 256), random.randrange(0, 256))
+        g.setColors(c, (0, 0, 0))
+
+    # start out with random colors
+    helperRestart()
+
     def helper():
         if g.finished():
             g.restart()
+            helperRestart()
         g.draw()
 
     t.debug_loop(helper)

manager.py

@@ -22,19 +22,18 @@ class Manager:
         if self.screens[self.index][1] == None:
             # let screen decide when it is done
             if self.screens[self.index][0].finished():
-                self.index = (self.index + 1) % len(self.screens)
                 self.lastTime = time.time()
+                self.index = (self.index + 1) % len(self.screens)
                 self.screens[self.index][0].restart()
         else:
             # use given timeout
             if (time.time() - self.lastTime) > self.screens[self.index][1]:
-                self.index = (self.index + 1) % len(self.screens)
                 self.lastTime = time.time()
+                self.index = (self.index + 1) % len(self.screens)
                 self.screens[self.index][0].restart()
 
 if __name__ == "__main__":
     from splash import SplashScreen
-    #from weather import WeatherScreen
     from draw import ScrollText
     from solid import Solid
     from life import GameOfLife
@@ -53,9 +52,6 @@ if __name__ == "__main__":
     m.add(SplashScreen(t), 2)
     m.add(Solid(t, 1.0))
 
-    #m.add(WeatherScreen(t), 4)
-    #m.add(Solid(t, 1.0))
-
     m.add(ScrollText(t, "This appears once"))
     m.add(Solid(t, 1.0))
 

weather.py

@@ -1,73 +0,0 @@
-#!/usr/bin/env python3
-
-from pyowm.owm import OWM
-from pyowm.utils.config import get_default_config
-
-import time
-
-api_key = "7de9d39fd4476f811000ceecbbe69376"
-
-class WeatherScreen:
-    def __init__(self, gui, latitude = 47.7174, longitude = 9.3924, language = "de", refresh = 600, width = 32, height = 32):
-        self.gui = gui
-        self.latitude = latitude
-        self.longitude = longitude
-        self.language = language
-        self.refresh = refresh
-        self.width = width
-        self.height = height
-
-        self.lastTime = time.time()
-        self.data = ""
-
-        self.fetchData()
-
-    def fetchData(self):
-        config_dict = get_default_config()
-        config_dict['language'] = self.language
-        owm = OWM(api_key, config_dict)
-        mgr = owm.weather_manager()
-
-        observation = mgr.weather_at_place("Tuttlingen, DE")
-        print(observation.weather.rain)
-        print(observation.weather.snow)
-        print(observation.weather.wind)
-        print(observation.weather.humidity)
-        print(observation.weather.pressure)
-        print(observation.weather.temperature)
-        print(observation.weather.clouds)
-        print(observation.weather.status)
-        print(observation.weather.detailed_status)
-        print(observation.weather.weather_icon_name)
-        print(observation.weather.precipitation_probability)
-
-        #self.data = mgr.one_call(lat=self.latitude, lon=self.longitude)
-        #print(self.data.forecast_hourly[0].wind().get("speed", 0))
-
-    def draw(self):
-        if (time.time() - self.lastTime) > self.refresh:
-            self.fetchData()
-            self.lastTime = time.time()
-
-        # TODO text location
-        # TODO text data
-
-    def finished(self):
-        return True
-
-    def restart(self):
-        pass
-
-if __name__ == "__main__":
-    import platform
-    t = None
-    if platform.machine() == "armv7l":
-        from pi import PiMatrix
-        t = PiMatrix()
-    else:
-        from test import TestGUI
-        t = TestGUI()
-
-    s = WeatherScreen(t)
-    s.draw()
-    t.debug_loop(s.draw)