various adjustments

breakout.py

@@ -11,6 +11,7 @@ from scroll import ScrollText
 import time
 import random
 import math
+import util
 
 class Breakout:
     def __init__(self, g, i, ts = 0.1, to = 60.0):
@@ -19,7 +20,7 @@ class Breakout:
         self.timestep = ts
         self.timeout = to
 
-        self.paddle_width = 9
+        self.paddle_width = 43#9
 
         self.winText = ScrollText(self.gui, "You Won!", "uushi",
                                   2, 50, (0, 255, 0))
@@ -28,6 +29,12 @@ class Breakout:
         self.scoreText = ScrollText(self.gui, "Score:", "uushi",
                                     2, 50, (255, 255, 255))
 
+        self.bg_c = (0, 0, 0)
+        self.fg_c = (0, 255, 0)
+        self.ball_c = (255, 0, 0)
+        self.paddle_c = (255, 255, 255)
+        self.text_c = (0, 0, 255)
+
         random.seed()
         self.restart()
 
@@ -47,11 +54,18 @@ class Breakout:
         self.score = 0
         self.direction = ""
 
-        self.data = [[(0, 0, 0) for y in range(self.gui.height)] for x in range(self.gui.width)]
+        self.data = [[self.bg_c for y in range(self.gui.height)] for x in range(self.gui.width)]
 
         for x in range(self.gui.width - 2):
             for y in range(5):
-                self.data[x + 1][y] = (0, 255, 0)
+                self.data[x + 1][y] = self.fg_c
+        self.maxScore = 5 * (self.gui.width - 2)
+
+        # TODO easy mode
+        self.nothing_to_lose = True
+
+        DrawText = util.getTextDrawer()
+        self.text = DrawText(self.gui, self.text_c)
 
         self.place()
 
@@ -95,8 +109,6 @@ class Breakout:
         self.old_keys = keys.copy()
 
     def step(self):
-        # TODO check for collisions with pieces
-
         # move ball
         self.ball[0] += self.ball[2]
         self.ball[1] += self.ball[3]
@@ -104,10 +116,21 @@ class Breakout:
         # check for collision with left wall
         if self.ball[0] <= 0:
             self.ball[2] = -self.ball[2]
+            self.ball[0] = 0
 
         # check for collision with right wall
         if self.ball[0] >= self.gui.width - 1:
             self.ball[2] = -self.ball[2]
+            self.ball[0] = self.gui.width - 1
+
+        # check for collisions with pieces
+        if self.data[int(self.ball[0])][int(self.ball[1])] != self.bg_c:
+            self.data[int(self.ball[0])][int(self.ball[1])] = self.bg_c
+            self.score += 1
+
+            # just invert Y travel direction
+            # TODO inaccurate collision behaviour in "corners"
+            self.ball[3] = -self.ball[3]
 
         # check for collision with ceiling
         if self.ball[1] <= 0:
@@ -115,22 +138,31 @@ class Breakout:
 
         # check for collision with paddle
         if (self.ball[1] == self.gui.height - 2) and (self.ball[0] >= (self.player - int(self.paddle_width / 2))) and (self.ball[0] <= (self.player + int(self.paddle_width / 2))):
-            # TODO angle
-            self.ball[3] = -self.ball[3]
+            # TODO angle for bounce from paddle
+            #self.ball[3] = -self.ball[3]
+            d = self.ball[0] - (self.player - (self.paddle_width / 2))
+            angle = (d / self.paddle_width - 0.5) / 2 * 3.14159
+            print(math.degrees(angle))
+            self.ball[2] = math.cos(angle) * math.sqrt(2)
+            self.ball[3] = math.sin(angle) * math.sqrt(2)
 
         # check for collision with floor
         if self.ball[1] >= self.gui.height - 1:
-            self.place()
-            self.lives -= 1
+            if self.nothing_to_lose:
+                # TODO should this bounce with an angle?
+                self.ball[3] = -self.ball[3]
+            else:
+                self.place()
+                self.lives -= 1
 
     def finishedEndScreen(self):
-        if self.score >= self.gui.width * self.gui.height:
+        if self.score >= self.maxScore:
             return self.winText.finished()
         else:
             return self.loseText.finished()
 
     def drawEndScreen(self):
-        if self.score >= self.gui.width * self.gui.height:
+        if self.score >= self.maxScore:
             self.winText.draw()
         else:
             self.loseText.draw()
@@ -139,13 +171,15 @@ class Breakout:
         self.scoreText.draw()
 
     def draw(self):
+        # handle / generate player inputs
         if self.input != None:
             self.buttons()
         else:
             # TODO "AI"
             pass
 
-        if self.lives < 0:
+        # only draw end-cards when game is over
+        if (self.lives < 0) or (self.score >= self.maxScore):
             if self.finishedEndScreen():
                 self.drawScoreScreen()
             else:
@@ -153,37 +187,58 @@ class Breakout:
                 self.scoreText.restart()
             return
 
+        # move paddle according to player input
         if self.direction == "l":
             self.player = max(self.player - 1, 0)
         elif self.direction == "r":
             self.player = min(self.player + 1, self.gui.width - 1)
         self.direction = ""
 
+        # run next iteration
         now = time.time()
         if (now - self.last) >= self.timestep:
             self.last = now
             self.step()
 
-            if self.lives < 0:
+            # end game when all lives lost or when won
+            if (self.lives < 0) or (self.score >= self.maxScore):
                 self.scoreText.setText("Score: " + str(self.score), "uushi")
                 self.winText.restart()
                 self.loseText.restart()
                 self.scoreText.restart()
 
+        # draw targets on playing area
         for x in range(0, self.gui.width):
             for y in range(0, self.gui.height):
                 self.gui.set_pixel(x, y, self.data[x][y])
 
+        # draw score
+        self.text.setText(str(self.score), "tom-thumb")
+        self.text.draw(-1, self.gui.height / 2 - 2)
+
+        # draw lives
+        self.text.setText(str(self.lives), "tom-thumb")
+        self.text.draw(-self.gui.width + 4, self.gui.height / 2 - 2)
+
+        # draw paddle
         for x in range(0, self.paddle_width):
-            self.gui.set_pixel(x + self.player - int(self.paddle_width / 2), self.gui.height - 1, (255, 255, 255))
+            self.gui.set_pixel(x + self.player - int(self.paddle_width / 2), self.gui.height - 1, self.paddle_c)
 
-        self.gui.set_pixel(self.ball[0], self.ball[1], (255, 0, 0))
+        # draw ball
+        self.gui.set_pixel(int(self.ball[0]), int(self.ball[1]), self.ball_c)
 
 if __name__ == "__main__":
-    import util
     # Need to import InputWrapper before initializing RGB Matrix on Pi
     i = util.getInput()
     t = util.getTarget(i)
 
     d = Breakout(t, i)
+
+    # example color modifications
+    d.fg_c = (0, 150, 0)
+    d.ball_c = (150, 0, 0)
+    d.paddle_c = (150, 150, 150)
+    d.text_c = (0, 0, 150)
+    d.restart() # re-gen with new colors
+
     util.loop(t, d.draw)

camp_pico.py

@@ -26,6 +26,8 @@ from pico import PicoBatt
 #url = "http://ubabot.frubar.net"
 url = "http://www.xythobuz.de"
 
+scroll_speed = 10
+
 import util
 i = util.getInput()
 t = util.getTarget(i)
@@ -39,20 +41,20 @@ 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_green))
+success.add(ScrollText(t, "Visit UbaBot Cocktail machine at FruBar village for drinks!", "bitmap8", 1, scroll_speed, camp_green))
 success.add(Solid(t, 1.0))
 success.add(QRScreen(t, qr_data, 30.0, "Drinks", "bitmap6", camp_pink, (0, 0, 0)))
 success.add(Solid(t, 1.0))
 
 # UbaBot is offline
 fail = Manager(t)
-fail.add(ScrollText(t, "#CCCAMP23", "bitmap8", 1, 10, camp_green))
+fail.add(ScrollText(t, "#CCCAMP23", "bitmap8", 1, scroll_speed, camp_green))
 fail.add(Solid(t, 1.0))
-fail.add(ScrollText(t, "The UbaBot Cocktail machine is closed. Please come back later!", "bitmap8", 1, 10, camp_green))
+fail.add(ScrollText(t, "The UbaBot Cocktail machine is closed. Please come back later!", "bitmap8", 1, scroll_speed, camp_green))
 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))
-fail.add(ScrollText(t, "Your advertisement could appear here. Open a Pull Request on git.xythobuz.de/thomas/rgb-matrix-visualizer or send an e-mail to thomas@xythobuz.de", "bitmap8", 1, 10, camp_green))
+fail.add(ScrollText(t, "Your advertisement could appear here. Open a Pull Request on git.xythobuz.de/thomas/rgb-matrix-visualizer or send an e-mail to thomas@xythobuz.de", "bitmap8", 1, scroll_speed, camp_green))
 fail.add(Solid(t, 1.0))
 
 # UbaBot status checker
@@ -66,6 +68,8 @@ m.add(QRScreen(t, img_data, 15.0, None, None, (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.add(ScrollText(t, "Need to print something? FruBar village has a 3D printer. Come by!", "bitmap8", 1, scroll_speed, camp_pink))
+m.add(Solid(t, 1.0))
 m.add(PicoBatt(t, 5.0, 5.0))
 m.add(Solid(t, 1.0))
 

camp_small.py

@@ -22,8 +22,8 @@ from gamepad import InputWrapper
 from manager import Manager
 import util
 
-#url = "http://ubabot.frubar.net"
-url = "http://www.xythobuz.de"
+url_uba = "http://ubabot.frubar.net"
+url_printer = "http://i3-am8.fritz.box"
 
 scroll_speed = 50
 
@@ -39,27 +39,42 @@ splash.draw()
 t.loop_end()
 
 # UbaBot is online
-success = Manager(t)
-success.add(ImageScreen(t, "drinka.gif", 0.2, 2, 20.0, (0, 0, 0)))
-success.add(Solid(t, 1.0))
-success.add(ScrollText(t, "Visit the UbaBot Cocktail machine at FruBar village for drinks!", "lemon", 2, scroll_speed, camp_green))
-success.add(Solid(t, 1.0))
-success.add(QRScreen(t, url, 30.0, "Drinks:", "tom-thumb", camp_pink, (0, 0, 0)))
-success.add(Solid(t, 1.0))
+success_uba = Manager(t)
+success_uba.add(ImageScreen(t, "drinka.gif", 0.2, 2, 20.0, (0, 0, 0)))
+success_uba.add(Solid(t, 1.0))
+success_uba.add(ScrollText(t, "Visit the UbaBot Cocktail machine at FruBar village for drinks!", "lemon", 2, scroll_speed, camp_green))
+success_uba.add(Solid(t, 1.0))
+success_uba.add(QRScreen(t, url_uba, 30.0, "Drinks:", "tom-thumb", camp_pink, (0, 0, 0)))
+success_uba.add(Solid(t, 1.0))
 
 # UbaBot is offline
-fail = Manager(t)
-fail.add(ImageScreen(t, "attention.gif", 0.2, 2, 20.0, (0, 0, 0)))
-fail.add(Solid(t, 1.0))
-fail.add(ScrollText(t, "The UbaBot Cocktail machine is currently closed. Please come back later for more drinks!", "lemon", 2, scroll_speed, 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))
+fail_uba = Manager(t)
+fail_uba.add(ImageScreen(t, "attention.gif", 0.2, 2, 20.0, (0, 0, 0)))
+fail_uba.add(Solid(t, 1.0))
+fail_uba.add(ScrollText(t, "The UbaBot Cocktail machine is currently closed. Please come back later for more drinks!", "lemon", 2, scroll_speed, camp_pink))
+fail_uba.add(Solid(t, 1.0))
+fail_uba.add(GameOfLife(t, 20, (0, 255, 0), (0, 0, 0), None, 2.0))
+fail_uba.add(Solid(t, 1.0))
 
 # UbaBot status checker
-d = CheckHTTP(url)
-d.success(success)
-d.fail(fail)
+d = CheckHTTP(url_uba)
+d.success(success_uba)
+d.fail(fail_uba)
+
+# 3D printer is online
+success_printer = Manager(t)
+success_printer.add(ScrollText(t, "Need to print something? FruBar village has a 3D printer. Come by!", "iv18x16u", 1, scroll_speed, camp_pink))
+success_printer.add(Solid(t, 1.0))
+
+# 3D printer is offline
+fail_printer = Manager(t)
+fail_printer.add(Solid(t, 1.0))
+fail_printer.add(Solid(t, 1.0))
+
+# Printer status checker
+d2 = CheckHTTP(url_printer)
+d2.success(success_printer)
+d2.fail(fail_printer)
 
 # Main "Menu"
 m = Manager(t, i)
@@ -67,8 +82,11 @@ m.add(ScrollText(t, "#CCCAMP23", "lemon", 1, scroll_speed, camp_green))
 m.add(Solid(t, 1.0))
 m.add(ImageScreen(t, "Favicon.png", 0, 1, 10.0))
 m.add(Solid(t, 1.0))
+m.add(ScrollText(t, "Grab a cold draft beer at FruBar village!", "iv18x16u", 1, scroll_speed, camp_green))
 m.add(d) # HTTP Check, either "success" or "fail"
 m.add(Solid(t, 1.0))
+m.add(d2) # HTTP Check, either "success" or "fail"
+m.add(Solid(t, 1.0))
 m.add(Snake(t, i, camp_pink, camp_green))
 m.add(Solid(t, 1.0))
 m.add(ScrollText(t, "Your advertisement could appear here. Open a Pull Request on git.xythobuz.de/thomas/rgb-matrix-visualizer or send an e-mail to thomas@xythobuz.de", "iv18x16u", 2, scroll_speed, camp_green))

hardware/frame.scad

@@ -0,0 +1,81 @@
+dia = 14.5;
+rod_l = 1200;
+
+wall = 4;
+clamp_d = dia + wall * 2;
+clamp_h = 30;
+screw = 4.5;
+
+l = rod_l + 2 * dia;
+
+plane_off = 100;
+plane_l = rod_l - plane_off;
+
+echo("rod", rod_l);
+echo("plane", plane_l);
+echo("outer", l);
+
+$fn = $preview ? 42 : 100;
+
+module rods() {
+    // left/right
+    for (x = [0, l])
+    translate([x, 0, 0])
+    cylinder(d = dia, h = rod_l);
+    
+    // top/bottom
+    for (z = [0, l])
+    translate([dia, 0, z - dia])
+    rotate([0, 90, 0])
+    cylinder(d = dia, h = rod_l);
+    
+    // plane
+    translate([(l - plane_l) / 2, 0, -dia + (l - plane_l) / 2 - 1 * plane_off])
+    cube([plane_l, 1, plane_l + 2 * plane_off]);
+    translate([(l - plane_l) / 2 - 1 * plane_off, 0, -dia + (l - plane_l) / 2])
+    cube([plane_l + 2 * plane_off, 1, plane_l]);
+}
+
+module clamp() {
+    difference() {
+        union() {
+            hull()
+            for (r = [0, 90])
+            rotate([0, r, 0])
+            translate([0, 0, dia])
+            cylinder(d = clamp_d, h = clamp_h / 2);
+            
+            for (r = [0, 90])
+            rotate([0, r, 0])
+            translate([0, 0, dia])
+            cylinder(d = clamp_d, h = clamp_h);
+        }
+        
+        for (r = [0, 90])
+        rotate([0, r, 0])
+        translate([0, 0, dia])
+        translate([0, 0, -20])
+        cylinder(d = dia, h = clamp_h + 30);
+        
+        for (i = [0, 1])
+        translate([i ? clamp_h * 3 / 4 + dia : 0, clamp_d / 2 + 1, i ? 0 : clamp_h * 3 / 4 + dia])
+        rotate([90, 0, 0])
+        cylinder(d = screw, h = clamp_d + 2);
+    }
+}
+
+module frame() {
+    %translate([-l / 2, 0, dia - l / 2])
+    rods();
+    
+    for (r = [0 : 90 : 360])
+    rotate([0, r, 0])
+    translate([-l/ 2, 0, -l / 2])
+    clamp();
+}
+
+if ($preview)
+    translate([l / 2, 0, l / 2])
+    frame();
+else
+    clamp();

image.py

@@ -65,6 +65,16 @@ class ImageScreen:
             self.image.is_animated = False
             self.image.n_frames = 1
 
+        # enlarge small images
+        if not self.image.is_animated and ((self.image.width * 2) <= self.gui.width) and ((self.image.height * 2) <= self.gui.height):
+            self.image = self.image.crop(self.image.getbbox())
+            self.image = self.image.resize((self.image.width * 2, self.image.height * 2),
+                                           Image.Resampling.NEAREST)
+            self.image.is_animated = False
+            self.image.n_frames = 1
+
+        # TODO cropping and scaling not working for GIF animations
+
         print(p, self.image.width, self.image.height, self.image.is_animated, self.image.n_frames)
 
         self.xOff = int((self.gui.width - self.image.width) / 2)
@@ -142,6 +152,8 @@ if __name__ == "__main__":
 
         if filename != "Favicon.png":
             continue
+        if (t.width != 32) or (t.height != 32):
+            continue
 
         try:
             # dump generated image to console, for embedding in Pico script

pi.py

@@ -32,7 +32,7 @@ from rgbmatrix import RGBMatrix, RGBMatrixOptions
 from PIL import Image
 
 class PiMatrix:
-    def __init__(self, w = 32 * 2, h = 32, panelW = 32, panelH = 32):
+    def __init__(self, w = 32 * 4, h = 32, panelW = 32, panelH = 32):
         self.width = w # x-axis
         self.height = h # y-axis
 
@@ -86,5 +86,7 @@ class PiMatrix:
         self.image.putpixel((int(x), int(y)), color)
 
 if __name__ == "__main__":
-    t = PiMatrix(32, 32)
+    import util
+
+    t = PiMatrix()
     util.loop(t, lambda: t.set_pixel(15, 15, (255, 255, 255)))

snake.py

@@ -10,6 +10,7 @@
 from scroll import ScrollText
 import time
 import random
+import util
 
 class Snake:
     def __init__(self, g, i, sc = (0, 255, 0), d = (0, 0, 255), bg = (0, 0, 0), ts = 0.3, su = 0.75, to = 60.0):
@@ -27,6 +28,8 @@ class Snake:
         self.scoreText = ScrollText(self.gui, "Score:", "uushi",
                                     2, 50, sc)
 
+        self.text_c = (0, 0, 255)
+
         random.seed()
         self.restart()
 
@@ -41,6 +44,9 @@ class Snake:
         self.player = [ (int(self.gui.width / 2), int(self.gui.height / 2)) ]
         self.data[self.player[0][0]][self.player[0][1]] = 1
 
+        DrawText = util.getTextDrawer()
+        self.text = DrawText(self.gui, self.text_c)
+
         self.old_keys = {
             "left": False,
             "right": False,
@@ -72,7 +78,7 @@ class Snake:
 
     def placeDot(self):
         d = (random.randrange(0, self.gui.width), random.randrange(0, self.gui.height))
-        while self.data[d[0]][d[1]] != 0:
+        while self.data[d[0]][d[1]] != 0: # TODO don't place dots below score text
             d = (random.randrange(0, self.gui.width), random.randrange(0, self.gui.height))
         self.data[d[0]][d[1]] = 2
 
@@ -177,8 +183,11 @@ class Snake:
             for y in range(0, self.gui.height):
                 self.gui.set_pixel(x, y, self.colors[self.data[x][y]])
 
+        # draw score
+        self.text.setText(str(self.score), "tom-thumb")
+        self.text.draw(-1, self.gui.height / 2 - 2)
+
 if __name__ == "__main__":
-    import util
     # Need to import InputWrapper before initializing RGB Matrix on Pi
     i = util.getInput()
     t = util.getTarget(i)

test.py

@@ -13,7 +13,7 @@
 import pygame
 
 class TestGUI:
-    def __init__(self, width = 32 * 1, height = 32, multiplier = 16):
+    def __init__(self, width = 32 * 2, height = 32 * 2, multiplier = 16):
         self.width = width
         self.height = height
         self.multiplier = multiplier

util.py

@@ -44,9 +44,10 @@ def getTarget(i = None):
         # TODO hard-coded adjustments
         from mapper import MapperReduceBrightness, MapperColorAdjust, MapperStripToRect
         bright = MapperReduceBrightness(pi, i)
-        col = MapperColorAdjust(bright)
+        #col = MapperColorAdjust(bright)
+        #target = col
         #target = MapperStripToRect(col)
-        target = col
+        target = MapperStripToRect(bright)
 
         if targetPlatform == None:
             # only print once