Merge branch 'ticker_api' into add-schedule

dok-net · dok-net · commit 800791209bcd · 2019-06-05T19:28:51.000+02:00
# Conflicts:
#	libraries/Ticker/src/Ticker.h
diff --git a/libraries/Ticker/keywords.txt b/libraries/Ticker/keywords.txt
@@ -8,7 +8,14 @@ Ticker	KEYWORD1
 # Methods and Functions (KEYWORD2)
 #######################################
 
+attach_scheduled	KEYWORD2
 attach	KEYWORD2
+attach_ms_scheduled	KEYWORD2
 attach_ms	KEYWORD2
+once_scheduled	KEYWORD2
 once	KEYWORD2
+once_ms_scheduled	KEYWORD2
+once_ms	KEYWORD2
 detach	KEYWORD2
+active	KEYWORD2
+
