diff --git a/raspi/mgmt/playbook.yml b/raspi/mgmt/playbook.yml index 06fc198..529d62f 100644 --- a/raspi/mgmt/playbook.yml +++ b/raspi/mgmt/playbook.yml @@ -3,6 +3,7 @@ become_user: root tasks: - synchronize: src=../.. dest=/home/pi/sejf + - file: path=/etc/xdg/autostart/pprompt.desktop state=absent - copy: src=autostart dest=/home/pi/.config/lxsession/LXDE-pi/autostart - copy: src=sejf.desktop dest=/etc/xdg/autostart - apt: name=python-flask state=present diff --git a/raspi/pySejf.py b/raspi/pySejf.py index 2445248..fc48c9b 100644 --- a/raspi/pySejf.py +++ b/raspi/pySejf.py @@ -22,6 +22,27 @@ from math import cos import time import RPi.GPIO as GPIO +class Slide(object): + def __init__(self): + pass + + def render(self, screen): + pass + + def handle(self, ev): + pass + + +class ImageSlide(Slide): + def __init__(self, image): + self.image = image + + def render(self, screen): + screen.fill(WHITE) + screen.blit(self.image, (0, 0)) + + + pygame.init() #gameplay @@ -155,7 +176,19 @@ SLIDE_SNAKE_DEAD = 10 #to nie slajd, tylko wartosc potrzebna do resetowania snak global slide #slajd poczatkowy slide = SLIDE_START -slides = [SLIDE_START,SLIDE_KEY,SLIDE_POT,SLIDE_FOAMBTN,SLIDE_SNAKE,SLIDE_KEYPAD,SLIDE_MAZE,SLIDE_MP3,SLIDE_KEYBOARD,SLIDE_CONGRATS] +slides = { + SLIDE_START: ImageSlide(IMG_HELLO), + SLIDE_KEY: ImageSlide(IMG_KEY), + SLIDE_POT: ImageSlide(IMG_POT), + SLIDE_FOAMBTN: ImageSlide(IMG_FOAMBTN), + #SLIDE_SNAKE, + SLIDE_DYNAMO: ImageSlide(IMG_DYNAMO), + SLIDE_KEYPAD: ImageSlide(IMG_KEYPAD), + SLIDE_MAZE: ImageSlide(IMG_KEYPAD), + SLIDE_MP3: ImageSlide(IMG_MP3), + #SLIDE_KEYBOARD, + #SLIDE_CONGRATS: ImageSlide(IMG_WIN) + } def win(): @@ -222,7 +255,6 @@ def waitForEvents(): slide = SLIDE_KEYBOARD print("mouse event") return - elif event.type == pygame.KEYDOWN: if slide != SLIDE_SNAKE: slide = SLIDE_SNAKE @@ -230,8 +262,7 @@ def waitForEvents(): slide = SLIDE_SNAKE_DEAD print("keydown event") return - - + def checkEvents(): global slide if GPIO.input(PIN_SET1) == 0 and slide != SLIDE_KEY: @@ -285,7 +316,7 @@ def drawSlide(n): screen.blit(slides[n], (0, 0)) pygame.display.flip() waitForEvents() - + def collide(x1, x2, y1, y2, w1, w2, h1, h2): if x1+w1>x2 and x1y2 and y1