X-Git-Url: https://git.ralfj.de/saartuer.git/blobdiff_plain/960dd08b9c20e339762ba9dab8977f29b05ac522..dfe98478e79cf926b2867677b3e1b90e6b679024:/waker.py

diff --git a/waker.py b/waker.py
index 7b212a1..1cf2884 100644
--- a/waker.py
+++ b/waker.py
@@ -1,13 +1,35 @@
 from libtuer import ThreadRepeater
-from statemachine import StateMachine
+from collections import namedtuple
+
+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, 0.5, name="Waker")
+		self._t = ThreadRepeater(self._wake, SLEEP_TIME, name="Waker")
+		self._tobewokens = []
+	
+	def register(f, time, one_shot = False):
+		'''Register a function which is called approximately every <time> seconds (or just once, if one_shot is True). f should return quickly, or it will delay the waker!'''
+		time = max(time//SLEEP_TIME, 1)
+		self._tobewokens.append(ToBeWoken(f, time, 0, one_shot))
 	
 	def _wake(self):
-		self._sm.callback(StateMachine.CMD_WAKEUP)
+		delete = []
+		# run the functions we ought to run
+		for tobewoken, idx in zip(self._tobewokens, range(len(self._tobewokens))):
+			tobewoken.time_since_call += 1
+			if tobewoken.time_since_call >= tobewoken.period:
+				tobewoken.f()
+				tobewoken.time_since_call = 0
+				if tobewoken.one_shot:
+					delete.append(idx)
+		# delete what we have to delete - in reverse order so the indices stay valid!
+		delete.reverse()
+		for idx in delete:
+			del self._tobewokens[idx]
 	
 	def stop(self):
 		self._t.stop()