projects
/
saartuer.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
more information in the logfile
[saartuer.git]
/
tuerd
diff --git
a/tuerd
b/tuerd
index 1bee788341c776acbb894475409707ea2e78a611..942c495267403d957e1e01ee579a3d88414e4a47 100755
(executable)
--- a/
tuerd
+++ b/
tuerd
@@
-1,6
+1,6
@@
#!/usr/bin/python3
import RPi.GPIO as GPIO
#!/usr/bin/python3
import RPi.GPIO as GPIO
-import statemachine, actor, pins, tysock, waker
+import statemachine, actor, pins, tysock, waker
, spaceapi
from libtuer import logger
import argparse
from libtuer import logger
import argparse
@@
-9,33
+9,47
@@
parser = argparse.ArgumentParser(description='Run a door')
parser.add_argument("-d", "--debug",
action="store_true", dest="debug",
help="Don't send emails")
parser.add_argument("-d", "--debug",
action="store_true", dest="debug",
help="Don't send emails")
+parser.add_argument("-f", "--fallback",
+ action="store_true", dest="fallback",
+ help="Fallback mode for unfunctional hardware: Depend on less sensor input")
args = parser.parse_args()
if args.debug:
import libtuer
libtuer.mailAddress = []
args = parser.parse_args()
if args.debug:
import libtuer
libtuer.mailAddress = []
+if args.fallback:
+ logger.info("Starting in fallback mode")
+else:
+ # 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)
+the_waker = waker.Waker()
+the_api = spaceapi.SpaceApi(the_waker)
+the_machine = statemachine.StateMachine(the_actor, the_waker, the_api, 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:
the_socket.accept()
except KeyboardInterrupt:
# this is what we waited for!
# we do the socket accept thing in the main thread
try:
the_socket.accept()
except KeyboardInterrupt:
# this is what we waited for!
- logger.info("Got SIGINT, terminating...")
pass
pass
+logger.info("Terminating...") # somehow this does not arrive in the syslog
+
# bring 'em all down
# 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_machine.stop()
+the_api.stop()
the_actor.stop()
# shutdown GPIO stuff
the_actor.stop()
# shutdown GPIO stuff