projects
/
saartuer.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
concept spaceAPI + Locking
[saartuer.git]
/
tuerd
diff --git
a/tuerd
b/tuerd
index 50fe03f8b08a8e058c1fc093a1aa826d8d4791d9..e828ebb6d5ecc85725163e5bd626292bd6239cb4 100755
(executable)
--- a/
tuerd
+++ b/
tuerd
@@
-22,15
+22,18
@@
else:
# to avoid exceptions or getting None
args.fallback = False
# to avoid exceptions or getting None
args.fallback = False
+# Not let's go!
+logger.info("Starting up...")
+
# initialize GPIO stuff
GPIO.setmode(GPIO.BOARD)
# bring 'em all up
the_actor = actor.Actor()
# initialize GPIO stuff
GPIO.setmode(GPIO.BOARD)
# bring 'em all up
the_actor = actor.Actor()
-the_machine = statemachine.StateMachine(the_actor, args.fallback)
+the_waker = waker.Waker(the_machine)
+the_machine = statemachine.StateMachine(the_actor, the_waker, args.fallback)
the_socket = tysock.TySocket(the_machine)
the_pins = pins.PinsWatcher(the_machine)
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:
# we do the socket accept thing in the main thread
try:
@@
-41,8
+44,8
@@
except KeyboardInterrupt:
pass
# bring 'em all down
pass
# bring 'em all down
-the_waker.stop()
-the_pins.stop()
+the_waker.stop()
# this one first, it "randomly" calls other threads
+the_pins.stop()
# as does this
the_machine.stop()
the_actor.stop()
the_machine.stop()
the_actor.stop()