diff --git a/config/settings/settings.conf b/config/settings/settings.conf index 500086fa..48c147f0 100644 --- a/config/settings/settings.conf +++ b/config/settings/settings.conf @@ -6,13 +6,13 @@ volume=1.0 [speech] enabled=True -driver=espeak +driver=speechd rate=0.75 pitch=0.5 module=espeak -voice=en-us -language=en-us -volume=1.0 +voice=de +language=de +volume=0.8 autoReadIncomming=True [braille] @@ -25,10 +25,10 @@ screenUpdateDelay=0.4 [keyboard] device=all -grabDevices=False +grabDevices=True ignoreShortcuts=False keyboardLayout=test -charEcho=False +charEcho=True charDeleteEcho=True wordEcho=True interruptOnKeyPress=False @@ -40,5 +40,5 @@ fenrirKeys=KEY_KP0 [promote] enabled=True -inactiveTimeoutSec=5 -list= +inactiveTimeoutSec=120 +list=chrys,test diff --git a/config/settings/settings.conf.chrys b/config/settings/settings.conf.chrys deleted file mode 100644 index 48c147f0..00000000 --- a/config/settings/settings.conf.chrys +++ /dev/null @@ -1,44 +0,0 @@ -[sound] -enabled=True -driver=sox -theme=default -volume=1.0 - -[speech] -enabled=True -driver=speechd -rate=0.75 -pitch=0.5 -module=espeak -voice=de -language=de -volume=0.8 -autoReadIncomming=True - -[braille] -enabled=False -layout=en - -[screen] -driver=linux -screenUpdateDelay=0.4 - -[keyboard] -device=all -grabDevices=True -ignoreShortcuts=False -keyboardLayout=test -charEcho=True -charDeleteEcho=True -wordEcho=True -interruptOnKeyPress=False - -[general] -debugLevel=0 -punctuationLevel=1 -fenrirKeys=KEY_KP0 - -[promote] -enabled=True -inactiveTimeoutSec=120 -list=chrys,test diff --git a/src/fenrir-package/core/screenData.py b/src/fenrir-package/core/screenData.py index 52d85475..28611ee5 100644 --- a/src/fenrir-package/core/screenData.py +++ b/src/fenrir-package/core/screenData.py @@ -17,6 +17,6 @@ screenData = { 'newContentBytes': b'', 'newContentText': '', 'newContentAttrib': b'', -'oldTTY':'0', +'oldTTY':'-1', 'newTTY':'0', } diff --git a/src/fenrir-package/screen/linux.py b/src/fenrir-package/screen/linux.py index 878f181f..94c770fe 100644 --- a/src/fenrir-package/screen/linux.py +++ b/src/fenrir-package/screen/linux.py @@ -34,7 +34,10 @@ class screen(): environment['screenData']['oldContentTextAttrib'] = environment['screenData']['newContentAttrib'] environment['screenData']['oldCursor']['x'] = environment['screenData']['newCursor']['x'] environment['screenData']['oldCursor']['y'] = environment['screenData']['newCursor']['y'] - environment['screenData']['oldTTY'] = environment['screenData']['newTTY'] + if environment['screenData']['oldTTY'] == '-1': + environment['screenData']['oldTTY'] = newTTY # dont recognice starting fenrir as change + else: + environment['screenData']['oldTTY'] = environment['screenData']['newTTY'] environment['screenData']['oldDelta'] = environment['screenData']['newDelta'] environment['screenData']['oldNegativeDelta'] = environment['screenData']['newNegativeDelta'] environment['screenData']['newTTY'] = newTTY