X-Git-Url: https://git.ralfj.de/saartuer.git/blobdiff_plain/6e7d90d419547705cb125adc7fe3626d9dc0fd49..a05dfd226f0b41c040a0b7e5cd61be1f22db81a2:/tuerd diff --git a/tuerd b/tuerd index 7cc15d6..c3a5a43 100755 --- a/tuerd +++ b/tuerd @@ -1,73 +1,30 @@ #!/usr/bin/python3 -import time, socket, os, stat -from datetime import datetime import RPi.GPIO as GPIO -GPIO.setmode(GPIO.BOARD) - -def log (what): - print (datetime.now(),what) - -def waynesend (conn, what): - try: - conn.send(what) - except: - log("Couldn't send %s" % str(what)) - -class Pinoutput: - # actionsanddelays is a list of pairs: (bool to send, delay in seconds to wait afterwards) - def __init__ (self, name, pinnumber, actionsanddelays): - self.name = name - self.pin = pinnumber - self.todo = actionsanddelays - GPIO.setup(pinnumber, GPIO.OUT) - log ("Pin %d set to be an output pin for %s." % (pinnumber,name)) - - def __call__ (self, conn): - for (value,delay) in self.todo: - GPIO.output(self.pin, value) - log ("%s: Pin %d set to %s." % (self.name,self.pin,str(value))) - time.sleep(delay) - waynesend(conn,b"1") - -tuergroupid = 1005 - -pinlist = [Pinoutput("open", 12, [(True, 0.3), (False, 5.0)]), - Pinoutput("close", 16, [(True, 0.3), (False, 5.0)]), - Pinoutput("buzz", 22, [(True, 2.0), (False, 5.0)])] - -socketname = "/run/tuer.sock" - +import statemachine, actor, pins, tysock, waker -def doNothing (conn): - log ("doing nothing") - waynesend(conn,b"0") - pass +# initialize GPIO stuff +GPIO.setmode(GPIO.BOARD) -sock = socket.socket (socket.AF_UNIX, socket.SOCK_STREAM) +# bring 'em all up +the_actor = actor.Actor() +the_machine = statemachine.StateMachine(the_actor) +the_socket = tysock.TySocket(the_machine) +the_pins = pins.PinsWatcher(the_machine) +the_waker = waker.Waker(the_machine) +# we do the socket accept thing in the main thread try: - os.unlink (socketname) -except OSError: + the_socket.accept() +except KeyboardInterrupt: + # this is what we waited for! pass -sock.bind (socketname) - -os.chown (socketname, 0, tuergroupid) -os.chmod (socketname, stat.S_IRUSR | stat.S_IWUSR | stat.S_IRGRP | stat.S_IWGRP) - -sock.listen(1) - -pindict = {} -for pin in pinlist: - pindict[pin.name.encode()] = pin - -while True: - conn, addr = sock.accept() - data = conn.recv (128) - log("received command: %s" % str(data)) - pindict.get(data,doNothing)(conn) - conn.close() +# bring 'em all down +the_waker.stop() +the_pins.stop() +the_socket.stop() +the_machine.stop() +the_actor.stop() +# shutdown GPIO stuff GPIO.cleanup() - -