From: Constantin Berhard Date: Sun, 27 Oct 2013 15:50:19 +0000 (+0100) Subject: some fixes, not totally fixed yet X-Git-Url: https://git.ralfj.de/saartuer.git/commitdiff_plain/b4ca24f8e8708dbb26c2ddd20c90a36217cc322f?ds=sidebyside some fixes, not totally fixed yet --- diff --git a/statemachine.py b/statemachine.py index 59951d4..a3a24d4 100644 --- a/statemachine.py +++ b/statemachine.py @@ -138,7 +138,7 @@ class StateMachine(): class StateStart(State): def __init__(self, sm, nervlist = None, fallback=False): - super().__init__(self, sm, nervlist) + super().__init__(sm, nervlist) self.fallback = fallback def handle_pins_event(self): pins = self.pins() @@ -156,7 +156,7 @@ class StateMachine(): class StateFallback(State): def __init__(self, sm, nervlist = None): - super().__init__(self, sm, nervlist) + super().__init__(sm, nervlist) self._last_blink_time = time.time() self._red_state = False def handle_pins_event(self): @@ -307,7 +307,7 @@ class StateMachine(): def __init__(self, actor, waker, fallback = False): self.actor = actor self.callback = ThreadFunction(self._callback, name="StateMachine") - self.current_state = StateMachine.StateStart(self, fallback) + self.current_state = StateMachine.StateStart(self, None, fallback) self.pins = None self.old_pins = None waker.register(lambda: self.callback(StateMachine.CMD_WAKEUP), 1.0) # wake up every second diff --git a/tuerd b/tuerd index e828ebb..8290c83 100755 --- a/tuerd +++ b/tuerd @@ -30,7 +30,7 @@ GPIO.setmode(GPIO.BOARD) # bring 'em all up the_actor = actor.Actor() -the_waker = waker.Waker(the_machine) +the_waker = waker.Waker() the_machine = statemachine.StateMachine(the_actor, the_waker, args.fallback) the_socket = tysock.TySocket(the_machine) the_pins = pins.PinsWatcher(the_machine) diff --git a/waker.py b/waker.py index 9c2cf06..dc4627b 100644 --- a/waker.py +++ b/waker.py @@ -7,13 +7,12 @@ SLEEP_TIME = 0.5 ToBeWoken = namedtuple('ToBeWoken','f period time_since_call one_shot') class Waker(): - def __init__(self, sm): - self._sm = sm - self._t = ThreadRepeater(self._wake, SLEEP_TIME, name="Waker") + def __init__(self): self._tobewokens = [] self._tobewokens_lock = Lock() + self._t = ThreadRepeater(self._wake, SLEEP_TIME, name="Waker") - def register(f, time, one_shot = False): + def register(self, f, time, one_shot = False): '''Register a function which is called approximately every