diff --git a/app.py b/app.py index 1669618..c09a78a 100755 --- a/app.py +++ b/app.py @@ -130,7 +130,16 @@ def run(self): globals.GLOW = True noise.stop() print('say:', data['whisper']) - sound.speak(data['whisper']) + if data['whisper'].lower() == "ok google": + okgoogle.play() + time.sleep(0.6) + okgoogle.stop() + elif data['whisper'].lower() == "alexa": + alexa.play() + time.sleep(0.5) + alexa.stop() + else: + sound.speak(data['whisper']) time.sleep(int(globals.SETTING['setting']['delay'])) noise.play() @@ -214,6 +223,8 @@ def main(): #Initialize the sound objects globals.initialize() noise = sound.audioPlayer(globals.NOISE_PATH) + okgoogle = sound.audioPlayer(globals.OKGOOGLE_PATH) + alexa = sound.audioPlayer(globals.ALEXA_PATH) thread_socket = Thread(target=socket_thread) thread_socket.daemon = True diff --git a/data/alexa.wav b/data/alexa.wav new file mode 100755 index 0000000..1f05769 Binary files /dev/null and b/data/alexa.wav differ diff --git a/data/ok_google.wav b/data/ok_google.wav new file mode 100755 index 0000000..234fd52 Binary files /dev/null and b/data/ok_google.wav differ diff --git a/modules/globals.py b/modules/globals.py index 3a4f8d6..13f5f57 100755 --- a/modules/globals.py +++ b/modules/globals.py @@ -31,10 +31,12 @@ def initialize(): - global ROOT_PATH, KEYWORD_PATH, NOISE_PATH, SETTINGS_PATH + global ROOT_PATH, KEYWORD_PATH, NOISE_PATH, OKGOOGLE_PATH, ALEXA_PATH, SETTINGS_PATH # absolute file paths ROOT_PATH = os.path.dirname(os.path.abspath(__file__)) KEYWORD_PATH = os.path.join(ROOT_PATH, '../data/keyphrase.list') NOISE_PATH = os.path.join(ROOT_PATH, '../data/noise.wav') + OKGOOGLE_PATH = os.path.join(ROOT_PATH, '../data/ok_google.wav') + ALEXA_PATH = os.path.join(ROOT_PATH, '../data/alexa.wav') SETTINGS_PATH = os.path.join(ROOT_PATH, '../data/settings.txt')