diff --git a/modules/hue/config.py b/modules/hue/config.py deleted file mode 100644 index 6e7119e..0000000 --- a/modules/hue/config.py +++ /dev/null @@ -1,4 +0,0 @@ -# Hue Remote Settings -class hue_config: - address = "192.168.0.3" - username = "E0ru0AeVFKEH1E30X40JAJfovg4Uu1aTkdrKQ2Oi" diff --git a/modules/hue/default-config.py b/modules/hue/default-config.py deleted file mode 100644 index db1a6ba..0000000 --- a/modules/hue/default-config.py +++ /dev/null @@ -1,8 +0,0 @@ -################################## -# RENAME THIS FILE TO "config.py"# -################################## - -# Hue Remote Settings -class hue_config: - address = "" # Local IPv4 address to the HUE bridge - username = "" # Username for the bridge diff --git a/modules/hue/presets.py b/modules/hue/presets.py deleted file mode 100644 index cfe6027..0000000 --- a/modules/hue/presets.py +++ /dev/null @@ -1,44 +0,0 @@ -# Presets goes in here -PRESETS = { - - "default": { - "color": (178, 199, 255), - "brightness": 255 - }, - - "dim": { - "color": (178, 199, 255), - "brightness": 111 - }, - - "dim": { - "color": (178, 199, 255), - "brightness": 80 - }, - - "red": { - "color": (255, 0, 0), - "brightness": 255 - }, - - "green": { - "color": (0, 255, 0), - "brightness": 255 - }, - - "blue": { - "color": (0, 0, 255), - "brightness": 255 - }, - - "ice" : { - "color": ( 80, 100, 255 ), - "brightness": 120 - }, - - "sleep": { - "color": (185, 155, 25), - "brightness": 60 - } - -} diff --git a/speech_daemon.py b/speech_daemon.py index f2f7a01..0683395 100755 --- a/speech_daemon.py +++ b/speech_daemon.py @@ -1,24 +1,47 @@ #!/usr/bin/env python +import sys + from modules.hue.hue_remote import parseCommandline from modules.hue.hue_controller import controller from modules.speech.speech import voiceInput -prefixes = ["computer", "computers"] +from modules.configloader.loader import readconfig + +from os.path import expanduser +homedir = expanduser("~") + +CONFIG = {} class speech_daemon(object): voiceInpObj = None + deviceIndex = 30 def __init__(self, deviceIndex=30): self.voiceInpObj = voiceInput() self.voiceInpObj.setMuted(False) + self.deviceIndex = deviceIndex + + def loadconfig(self): + path = homedir + "/.config/roomcomputer/config.json" + # if no config path is + # specified then choose the users default + + if( len(sys.argv) > 1 ): + path = sys.argv[1] + + cfg = readconfig(path) # read the config + + global CONFIG + CONFIG = cfg + def start(self): controller.init() - for inp in self.voiceInpObj.start(): + for inp in self.voiceInpObj.start( self.deviceIndex ): cmdBuf = inp.lower().split(" ") - if( cmdBuf[0] in prefixes ): + if( cmdBuf[0] in CONFIG["speech"]["prefixes"] ): print("CMD:", cmdBuf) parseCommandline( cmdBuf, False ) @@ -26,4 +49,5 @@ class speech_daemon(object): if __name__ == "__main__": daemon = speech_daemon() + daemon.loadconfig() daemon.start()