Merge branch 'master' into wordWrappingEndOfScreenBell

2016-11-13 22:51:08 +01:00
parent edad1b085e 7bc4745e2a
commit 59384f4f28
6 changed files with 42 additions and 11 deletions
--- a/config/settings/settings.conf
+++ b/config/settings/settings.conf
@ -130,5 +130,8 @@ enabled=False
 presentTime=True
 # present date (on change)
 presentDate=True
-# present time after x seconds
-delaySec=3600
+# present time after a given period of seconds
+delaySec=0
+# present time after to given minutes example every 15 minutes: 00,15,30,45
+# if delaySec is >0 onMinutes is ignored
+onMinutes=00,30