Merge branch 'master' into wordWrappingEndOfScreenBell

src/fenrir/commands/commands/toggle_auto_time.py

@@ -0,0 +1,26 @@
+#!/bin/python
+# -*- coding: utf-8 -*-
+
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+from core import debug
+class command():
+    def __init__(self):
+        pass
+    def initialize(self, environment):
+        self.env = environment
+    def shutdown(self):
+        pass 
+    def getDescription(self):
+        return 'enables or disables automatic reading of time after an period'        
+    
+    def run(self):
+        self.env['runtime']['settingsManager'].setSetting('time', 'enabled', str(not self.env['runtime']['settingsManager'].getSettingAsBool('time', 'enabled')))   
+        if self.env['runtime']['settingsManager'].getSettingAsBool('time', 'enabled'): 
+            self.env['runtime']['outputManager'].presentText("autotime enabled", soundIcon='', interrupt=True)
+        else:
+            self.env['runtime']['outputManager'].presentText("autotime disabled", soundIcon='', interrupt=True)                          
+    
+    def setCallback(self, callback):
+        pass

src/fenrir/commands/onScreenUpdate/76000-time.py

@@ -0,0 +1,46 @@
+#!/bin/python
+import time
+# -*- coding: utf-8 -*-
+
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+from core import debug
+import time
+import datetime
+
+class command():
+    def __init__(self):
+        pass
+    def initialize(self, environment):
+        self.env = environment
+        self.lastTime = time.time()
+        self.lastDateString = ''
+        self.lastTimeString = ''        
+    def shutdown(self):
+        pass
+    def getDescription(self):
+        return 'No Description found'     
+
+    def run(self):
+        if not self.env['runtime']['settingsManager'].getSettingAsBool('time', 'enabled'):
+            return
+        if int(time.time() - self.lastTime) < self.env['runtime']['settingsManager'].getSettingAsInt('time', 'delaySec'):
+            return
+        timeFormat = self.env['runtime']['settingsManager'].getSetting('general', 'timeFormat')
+        timeString = datetime.datetime.strftime(datetime.datetime.now(), timeFormat)
+        
+        dateFormat = self.env['runtime']['settingsManager'].getSetting('general', 'dateFormat')
+        dateString = datetime.datetime.strftime(datetime.datetime.now(), dateFormat)
+        if self.env['runtime']['settingsManager'].getSettingAsBool('time', 'presentTime'):
+            # present the time
+            self.env['runtime']['outputManager'].presentText('Autotime: ' + timeString , soundIcon='', interrupt=False)
+        # and date if changes
+        if self.env['runtime']['settingsManager'].getSettingAsBool('time', 'presentDate'):        
+            if self.lastDateString != dateString:
+                self.env['runtime']['outputManager'].presentText(dateString , soundIcon='', interrupt=False)        
+                self.lastDateString = dateString
+        self.lastTime = time.time() 
+        self.lastTimeString = timeString                         
+    def setCallback(self, callback):
+        pass

src/fenrir/core/settings.py

@@ -64,6 +64,12 @@ settings = {
   'inactiveTimeoutSec': 120,
   'list': '',
 },
+'time':{
+  'enabled': False,
+  'presentTime': True,
+  'presentDate': True,  
+  'delaySec': 3600,
+},
 'keyboard':{
   'driver': 'evdev',
   'device': 'all',

src/fenrir/fenrir.py

@@ -69,6 +69,7 @@ class fenrir():
 
     def prepareCommand(self):
         if self.environment['runtime']['screenManager'].isSuspendingScreen():
+            self.wasCommand = False
             return        
         if self.environment['runtime']['inputManager'].noKeyPressed():
             return