diff --git a/.gitignore b/.gitignore index 6180f81..a8054db 100644 --- a/.gitignore +++ b/.gitignore @@ -221,3 +221,4 @@ yarn-error.log # custom .idea/ +sounds/ \ No newline at end of file diff --git a/cameraworker.py b/cameraworker.py index 8a152a6..5d96024 100644 --- a/cameraworker.py +++ b/cameraworker.py @@ -4,7 +4,6 @@ from redis import Redis from control.camera import Camera -INTERVAL_TICK = 0.0125 # 20/s INTERVAL_IMAGE = 0.05 # 20/s diff --git a/tickworker.py b/tickworker.py index 31779b4..1659e10 100644 --- a/tickworker.py +++ b/tickworker.py @@ -50,12 +50,10 @@ class EventListener(Thread): scheduler = sched.scheduler() +audio = AudioSystem(scheduler, 'sounds.json') walle = WallE() walle.setup() -audio = AudioSystem(scheduler, 'sounds.json') -audio.queue_sound('walle.boot') - def walle_tick(): scheduler.enter(INTERVAL_TICK, 1, walle_tick) @@ -64,6 +62,8 @@ def walle_tick(): scheduler.enter(INTERVAL_TICK, 1, walle_tick) +audio.queue_sound('walle.boot') + if __name__ == '__main__': redisdb = Redis() event_listener = EventListener()