From cb1feb35ae82e3adfd8eab57a15bd2117e554355 Mon Sep 17 00:00:00 2001 From: chrys Date: Wed, 14 Sep 2016 23:06:56 +0200 Subject: [PATCH] make i runable again and make autodetecto of X working --- config/settings/settings.conf | 63 ++++------------------ config/settings/settings.conf.chrys | 55 ------------------- src/fenrir-package/core/commands.py | 2 +- src/fenrir-package/core/screenManager.py | 7 +-- src/fenrir-package/core/settingsManager.py | 3 +- 5 files changed, 17 insertions(+), 113 deletions(-) delete mode 100644 config/settings/settings.conf.chrys diff --git a/config/settings/settings.conf b/config/settings/settings.conf index 15b3ff1a..6e29be49 100644 --- a/config/settings/settings.conf +++ b/config/settings/settings.conf @@ -1,56 +1,21 @@ [sound] -# Turn sound on or off: enabled=True - -# Select the driver used to play sounds, choices are sox and gstreamer. -# Sox is the default. driver=sox - -# Sound themes. This is the pack of sounds used for sound alerts. -# Sound packs may be located at /usr/share/sounds -# For system wide availability, or ~/.local/share/fenrir/sounds -# For the current user. theme=default - -# Sound volume controls how loud the sounds for your chosen soundpack are. -# 0 is quietest, 1.0 is loudest. volume=1.0 [speech] -# Turn speech on or off: enabled=True - -# Select speech driver, options are speechd (default) or espeak: driver=speechd -#driver=espeak - - -# The rate selects how fast fenrir will speak. Options range from 0, slowest, to 1.0, fastest. -rate=0.45 - -# Pitch controls the pitch of the voice, select from 0, lowest, to 1.0, highest. +rate=0.75 pitch=0.5 - -# Volume controls the loudness of the voice, select from 0, quietest, to 1.0, loudest. -volume=1.0 - -# Module is used for speech-dispatcher, to select the speech module you want to use. -# Consult speech-dispatcher's configuration and help ti find out which modules are available. -# The default is espeak. module=espeak - -# Voice selects the varient you want to use, for example, f5 will use the female voice #5 in espeak, -# or if using the espeak module in speech-dispatcher. To find out which voices are available, consult the documentation provided with your chosen synthesizer. -voice= - -# Select the language you want fenrir to use. -language=english-us - -# Read new text as it happens? +voice=de +language=de +volume=0.8 autoReadIncomming=True [braille] -#braille is not implemented yet enabled=False layout=en @@ -64,35 +29,27 @@ autodetectSuspendingScreen=False [keyboard] driver=evdev device=all -# gives fenrir exclusive access to the keyboard and let consume keystrokes. just disable on problems. grabDevices=True ignoreShortcuts=False -# the current shortcut layout located in /etc/fenrir/keyboard -keyboardLayout=desktop -# echo chars while typing. -charEcho=False -# echo deleted chars +keyboardLayout=test +charEcho=True charDeleteEcho=True -# echo word after pressing space -wordEcho=False -# interrupt speech on any keypress +wordEcho=True interruptOnKeyPress=False # timeout for double tap in sec doubleTapDelay=0.2 [general] -debugLevel=0 +debugLevel=1 punctuationLevel=1 numberOfClipboards=10 -# define the current fenrir key fenrirKeys=KEY_KP0 timeFormat=%H:%M:%P +dateFormat="%A, %B %d, %Y" autoSpellCheck=True spellCheckLanguage=en_US [promote] enabled=True inactiveTimeoutSec=120 -list= - - +list=chrys,test diff --git a/config/settings/settings.conf.chrys b/config/settings/settings.conf.chrys deleted file mode 100644 index 6e29be49..00000000 --- a/config/settings/settings.conf.chrys +++ /dev/null @@ -1,55 +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 -encoding=cp850 -screenUpdateDelay=0.4 -suspendingScreen=1,2 -autodetectSuspendingScreen=False - -[keyboard] -driver=evdev -device=all -grabDevices=True -ignoreShortcuts=False -keyboardLayout=test -charEcho=True -charDeleteEcho=True -wordEcho=True -interruptOnKeyPress=False -# timeout for double tap in sec -doubleTapDelay=0.2 - -[general] -debugLevel=1 -punctuationLevel=1 -numberOfClipboards=10 -fenrirKeys=KEY_KP0 -timeFormat=%H:%M:%P -dateFormat="%A, %B %d, %Y" -autoSpellCheck=True -spellCheckLanguage=en_US - -[promote] -enabled=True -inactiveTimeoutSec=120 -list=chrys,test diff --git a/src/fenrir-package/core/commands.py b/src/fenrir-package/core/commands.py index 7f02ce43..c6f7eec6 100644 --- a/src/fenrir-package/core/commands.py +++ b/src/fenrir-package/core/commands.py @@ -16,7 +16,7 @@ commandBuffer = { # used by the commandManager commandInfo = { 'currCommand': '', -'lastCommandExecutionTime': time.time() +'lastCommandExecutionTime': time.time(), 'lastCommandRequestTime': time.time() } diff --git a/src/fenrir-package/core/screenManager.py b/src/fenrir-package/core/screenManager.py index 91120fae..1cb92600 100644 --- a/src/fenrir-package/core/screenManager.py +++ b/src/fenrir-package/core/screenManager.py @@ -4,11 +4,12 @@ from utils import debug class screenManager(): def __init__(self): - + pass def initialize(self, environment): self.autoIgnoreScreens = [] if environment['runtime']['settingsManager'].getSettingAsBool(environment,'screen', 'autodetectSuspendingScreen'): self.autoIgnoreScreens = environment['runtime']['screenDriver'].getIgnoreScreens() + return environment def shutdown(self, environment): return environment @@ -21,7 +22,7 @@ class screenManager(): def isSuspendingScreen(self, environment): currScreen = environment['runtime']['screenDriver'].getCurrScreen() - return (currScreen in \ + return ((currScreen in \ environment['runtime']['settingsManager'].getSetting(environment,'screen', 'suspendingScreen').split(',')) or - (currScreen in self.autoIgnoreScreens) + (currScreen in self.autoIgnoreScreens)) diff --git a/src/fenrir-package/core/settingsManager.py b/src/fenrir-package/core/settingsManager.py index 769da93c..1b250437 100644 --- a/src/fenrir-package/core/settingsManager.py +++ b/src/fenrir-package/core/settingsManager.py @@ -238,7 +238,8 @@ class settingsManager(): environment = environment['runtime']['outputManager'].initialize(environment) if environment['runtime']['commandManager'] == None: environment['runtime']['commandManager'] = commandManager.commandManager() - environment = environment['runtime']['commandManager'].initialize(environment) + environment = environment['runtime']['commandManager'].initialize(environment) + if environment['runtime']['screenManager'] == None: environment['runtime']['screenManager'] = screenManager.screenManager() environment = environment['runtime']['screenManager'].initialize(environment)