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/src/fenrir/core/settings.py
+++ b/src/fenrir/core/settings.py
@@ -68,7 +68,8 @@ settings = {
  'enabled': False,
  'presentTime': True,
  'presentDate': True,  
-  'delaySec': 3600,
+  'delaySec': 0,
+  'onMinutes': '00,30',
 },
 'keyboard':{
  'driver': 'evdev',