Merge branch 'master' into processing

config/settings/espeak.settings.conf

@@ -86,7 +86,7 @@ fenrirMaxRate=450
 
 [braille]
 enabled=False
-driver=brlapiDriver
+driver=dummyDriver
 layout=en
 # to what should the flush timeout relate to 
 # word = flush after (number of words to display) * seconds

config/settings/settings.conf

@@ -88,7 +88,7 @@ fenrirMaxRate=450
 
 [braille]
 enabled=False
-driver=brlapiDriver
+driver=dummyDriver
 layout=en
 # to what should the flush timeout relate to 
 # word = flush after (number of words to display) * seconds

config/settings/settings.conf.storm

@@ -45,7 +45,7 @@ fenrirMaxRate=890
 
 [braille]
 enabled=False
-driver=brlapiDriver
+driver=dummyDriver
 layout=en
 # to what should the flush timeout relate to 
 # word = flush after (number of words to display) * seconds

src/fenrir/brailleDriver/dummyDriver.py

@@ -8,41 +8,48 @@ from core import debug
 
 class driver():
     def __init__(self):
-        pass
+        self.printMessages = False
 
     def initialize(self, environment):
         self.env = environment
         self._isInitialized = True
         self.deviceSize = (40,0)
+        if self.printMessages:
             print('BrailleDummyDriver: Initialize')
         
 
     def getDeviceSize(self):
         if not self._isInitialized:
             return (0,0)
+        if self.printMessages:
             print('BrailleDummyDriver: getDeviceSize ' + str(self.deviceSize))
         return self.deviceSize
 
     def writeText(self,text):
         if not self._isInitialized:
             return
+        if self.printMessages:
             print('BrailleDummyDriver: writeText:' + str(text))
             print('BrailleDummyDriver: -----------------------------------')
 
     def connectDevice(self):
+        if self.printMessages:
             print('BrailleDummyDriver: connectDevice')
 
     def enterScreen(self, screen):
         if not self._isInitialized:
             return
+        if self.printMessages:
             print('BrailleDummyDriver: enterScreen')
 
     def leveScreen(self):
         if not self._isInitialized:
             return
+        if self.printMessages:
             print('BrailleDummyDriver: leveScreen')
 
     def shutdown(self):
         if not self._isInitialized:
             return
+        if self.printMessages:
             print('BrailleDummyDriver: Shutdown')

src/fenrir/commands/onScreenUpdate/70000-incoming.py

@@ -22,12 +22,8 @@ class command():
         # is there something to read?
         if not self.env['runtime']['screenManager'].isDelta():
             return      
+        # this must be a keyecho or something      
         if len(self.env['screen']['newDelta']) <=2:
-            return
-        # its a cursor movement (experimental) - maybe also check current shortcut string?
-        
-        #if not '$' in self.env['screen']['newDelta'] and
-        #  not '#' in self.env['screen']['newDelta']:
             if abs(self.env['screen']['newCursor']['x'] - self.env['screen']['oldCursor']['x']) == 1:
             # if len(self.env['screen']['newDelta'].strip(' \n\t0123456789')) <= 2:
                 return          

src/fenrir/core/fenrirManager.py

@@ -101,7 +101,6 @@ class fenrirManager():
             
     def handleScreenUpdate(self, event):
         #startTime = time.time()
-
         self.environment['runtime']['screenManager'].update('onUpdate')
         '''
         if self.environment['runtime']['applicationManager'].isApplicationChange():