Browse Source

fix callback method

Nicolas Marcq 8 years ago
parent
commit
3085f8f27f
4 changed files with 14 additions and 5 deletions
  1. 4 2
      core/JarvisTrigger.py
  2. 7 1
      core/OrderListener.py
  3. 1 0
      jarvis.py
  4. 2 2
      test.py

+ 4 - 2
core/JarvisTrigger.py

@@ -1,3 +1,4 @@
+from core.OrderListener import OrderListener
 from stt.snowboy import snowboydecoder
 
 
@@ -10,6 +11,7 @@ class JarvisTrigger:
         self.model = "stt/snowboy/resources/jarviss.pmdl"
         # boolean used to stop the snowbow listening
         self.interrupted = False
+        self.order_listener = OrderListener()
 
     def interrupt_callback(self):
         """
@@ -24,11 +26,11 @@ class JarvisTrigger:
         :return:
         """
 
-        detector = snowboydecoder.HotwordDetector(self.model, sensitivity=0.5)
+        detector = snowboydecoder.HotwordDetector(self.model, sensitivity=0.4)
 
         # start snowboy loop
         # TODO change to callback, call a function that wait for an audio order
-        detector.start(detected_callback=snowboydecoder.play_audio_file,
+        detector.start(detected_callback=self.order_listener.hotword_detected,
                        interrupt_check=self.interrupt_callback,
                        sleep_time=0.03)
 

+ 7 - 1
core/OrderListener.py

@@ -1,3 +1,4 @@
+from neurons import Say
 
 
 class OrderListener:
@@ -7,4 +8,9 @@ class OrderListener:
      attached to this order from settings
     """
     def __init__(self):
-        pass
+        pass
+
+    def hotword_detected(self):
+        print "Start listening order"
+        say = Say("oui monsieur?")
+

+ 1 - 0
jarvis.py

@@ -1,4 +1,5 @@
 from core.JarvisTrigger import JarvisTrigger
+from core.OrderListener import OrderListener
 
 
 def main():

+ 2 - 2
test.py

@@ -1,7 +1,7 @@
 from neurons import Say
 from neurons import SystemDate
 
-#say_neurone = Say("oui monsieur?")
+say_neurone = Say("oui monsieur?")
 
 
-date_neurone = SystemDate()
+#date_neurone = SystemDate()