Merge pull request #4 from btc-raspberrypiclub/revelstoke/python3.11

Revelstoke/python3.11
btc-raspberrypiclub · Apr 18, 2024 · c008cd0 · c008cd0
2 parents b514c39 + 6ff66e6
commit c008cd0
Show file tree

Hide file tree

Showing 34 changed files with 29 additions and 701 deletions.
diff --git a/README.md b/README.md
@@ -32,4 +32,4 @@ This software is designed to be used with the Raspberry Pi. If you would like to
 
 Also, to use the X11 system from within a container, see this [Medium article](https://medium.com/geekculture/run-a-gui-software-inside-a-docker-container-dce61771f9).
 
-WARNING!!! This repo is under rapid development as we move it to modern Python and put it into a container image to more easily be run and maintained.
+WARNING!!! This repo is under rapid development as we move it to modern Python and put it into a container image to more easily be run and maintained.
diff --git a/button.py b/button.py
@@ -10,9 +10,13 @@ def __init__(self):
 
         #Setup pins and board
         gpio.setmode(gpio.BCM)
+        #Pin 22 is Team 2
         gpio.setup(22, gpio.IN, pull_up_down=gpio.PUD_DOWN)
+        #Pin 4 is Team 3
         gpio.setup(4, gpio.IN, pull_up_down=gpio.PUD_DOWN)
+        #Pin 17 is Team 1
         gpio.setup(17, gpio.IN, pull_up_down=gpio.PUD_DOWN)
+        #GPIO Needs to be setup between 3.3v and pins above
 
         #Put pins in variables
         self.center_button = 22

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,24 +1,25 @@
 
 services:
 
-  # Building and testing environment
+  # Developing and testing environment
   dev:
     build:
       context: .
       dockerfile: Dockerfile
     image: ghcr.io/btc-raspberrypiclub/jeopardy:latest
     stdin_open: true
     tty: true
-    command: ["/bin/bash"]
     volumes:
       #- ${PWD}:/app
       - /tmp/.X11-unix:/tmp/.X11-unix
+    # Bring the DISPLAY through from the host
     environment:
       - DISPLAY=${DISPLAY:-:0}
     privileged: true
     profiles:
       - build
 
+  # The actual application service for live 
   app:
     image: ghcr.io/btc-raspberrypiclub/jeopardy:latest
     stdin_open: true

diff --git a/games/Example/categories.txt b/games/Example/categories.txt
diff --git a/games/Example/players.txt b/games/Example/players.txt
diff --git a/games/Example/INSTRUCTIONS.txt → games/Jeopardy/INSTRUCTIONS.txt b/games/Example/INSTRUCTIONS.txt → games/Jeopardy/INSTRUCTIONS.txt
diff --git a/games/Example/amounts.txt → games/Jeopardy/amounts.txt b/games/Example/amounts.txt → games/Jeopardy/amounts.txt
diff --git a/games/Jeopardy/categories.txt b/games/Jeopardy/categories.txt
@@ -0,0 +1,5 @@
+BEARS CATEGORY
+BEETS CATEGORY
+BATTLESTAR CATEGORY
+GALACTICA LONG CATEGORY NAME
+ALLURBASE CATEGORY
diff --git a/games/Example/clues.txt → games/Jeopardy/clues.txt b/games/Example/clues.txt → games/Jeopardy/clues.txt
diff --git a/games/Jeopardy/players.txt b/games/Jeopardy/players.txt
@@ -0,0 +1,5 @@
+Team Alpha
+Team Beta
+Team Gamma
+Team Delta
+Team Epsilon
diff --git a/games/Example/rules.txt → games/Jeopardy/rules.txt b/games/Example/rules.txt → games/Jeopardy/rules.txt
diff --git a/games/Prototype/INSTRUCTIONS.txt b/games/Prototype/INSTRUCTIONS.txt
diff --git a/games/Prototype/amounts.txt b/games/Prototype/amounts.txt
diff --git a/games/Prototype/categories.txt b/games/Prototype/categories.txt
diff --git a/games/Prototype/clues.txt b/games/Prototype/clues.txt
diff --git a/games/Prototype/players.txt b/games/Prototype/players.txt
diff --git a/games/Prototype/rules.txt b/games/Prototype/rules.txt
Original file line number	Diff line number	Diff line change
Expand Up		@@ -32,4 +32,4 @@ This software is designed to be used with the Raspberry Pi. If you would like to

		Also, to use the X11 system from within a container, see this [Medium article](https://medium.com/geekculture/run-a-gui-software-inside-a-docker-container-dce61771f9).

		WARNING!!! This repo is under rapid development as we move it to modern Python and put it into a container image to more easily be run and maintained.
		WARNING!!! This repo is under rapid development as we move it to modern Python and put it into a container image to more easily be run and maintained.