From a1f5548681e1bcea90ea0e057d7b7484071b85c7 Mon Sep 17 00:00:00 2001
From: Mike Gray <mike@graywind.org>
Date: Thu, 6 Jun 2024 23:54:42 -0500
Subject: [PATCH 1/2] feat: config to support additional voices and wakewords

- Lift restriction on openwakeword version, as it has been patched
- Add a hey_jarvis config, and make sure hey_neon has listen: true, so we can cycle among these wakewords at will
---
 neon_core/configuration/mark_2/neon.yaml | 13 +++++++++----
 requirements/pi.txt                      |  2 --
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/neon_core/configuration/mark_2/neon.yaml b/neon_core/configuration/mark_2/neon.yaml
index 134a7587c..75b08f0ad 100644
--- a/neon_core/configuration/mark_2/neon.yaml
+++ b/neon_core/configuration/mark_2/neon.yaml
@@ -21,7 +21,7 @@ Audio:
       dbus_type: system
 audio_parsers:
   blacklist:
-  - gender
+    - gender
 stt:
   module: google_cloud_streaming
   fallback_module: ovos-stt-plugin-vosk
@@ -42,6 +42,8 @@ hotwords:
     active: false
   hey_neon:
     model_folder: /home/neon/.local/share/neon/vosk-model-small-en-us-0.15
+    active: false
+    listen: true
   hey_mycroft:
     module: ovos-ww-plugin-precise-lite
     model: https://github.com/OpenVoiceOS/precise-lite-models/raw/master/wakewords/en/hey_mycroft.tflite
@@ -49,7 +51,10 @@ hotwords:
     expected_duration: 3
     trigger_level: 3
     sensitivity: 0.5
-
+  hey_jarvis:
+    module: ovos-ww-plugin-openwakeword
+    active: false
+    listen: true
 sounds:
   start_listening: snd/start_listening.wav
   acknowledge: snd/acknowledge.mp3
@@ -98,7 +103,7 @@ PHAL:
     debug: false
     ssid: Neon
     psk:
-    color: '#ff8600'
+    color: "#ff8600"
     portal: start dot neon dot ai
     device: Neon Device
   ovos-PHAL-plugin-system:
@@ -174,4 +179,4 @@ language:
   translation_module: libretranslate_plug
 utterance_transformers:
   neon_utterance_translator_plugin:
-    enable_detector: False
\ No newline at end of file
+    enable_detector: False
diff --git a/requirements/pi.txt b/requirements/pi.txt
index 256239f5e..389b7779a 100644
--- a/requirements/pi.txt
+++ b/requirements/pi.txt
@@ -16,8 +16,6 @@ onnxruntime!=1.16.0  # TODO: Patching https://github.com/microsoft/onnxruntime/i
 ovos-ww-plugin-precise~=0.1
 ovos-ww-plugin-precise-lite[tflite]~=0.1,>=0.1.2
 ovos-ww-plugin-vosk~=0.1,>=0.1.1
-# patching breaking change in openeakeword
-openwakeword~=0.5,<0.6
 ovos-ww-plugin-openwakeword~=0.2
 neon-stt-plugin-google-cloud-streaming~=1.0,>=1.0.1
 

From 70f296864bd59d335755c717d8d39b85ff6d3433 Mon Sep 17 00:00:00 2001
From: Mike Gray <mike@graywind.org>
Date: Wed, 26 Jun 2024 13:15:03 -0500
Subject: [PATCH 2/2] requested change

---
 neon_core/configuration/mark_2/neon.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/neon_core/configuration/mark_2/neon.yaml b/neon_core/configuration/mark_2/neon.yaml
index 561fdfe89..71e32a592 100644
--- a/neon_core/configuration/mark_2/neon.yaml
+++ b/neon_core/configuration/mark_2/neon.yaml
@@ -43,7 +43,7 @@ hotwords:
     active: false
   hey_neon:
     model_folder: /home/neon/.local/share/neon/vosk-model-small-en-us-0.15
-    active: false
+    active: true
     listen: true
   hey_mycroft:
     module: ovos-ww-plugin-precise-lite