handle internal state only in mWW

esphome · Oct 16, 2024 · 108c539 · 108c539
1 parent 24a2841
commit 108c539
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 10 deletions.
diff --git a/esphome/components/micro_wake_word/micro_wake_word.cpp b/esphome/components/micro_wake_word/micro_wake_word.cpp
@@ -214,6 +214,16 @@ void MicroWakeWord::preprocessor_task_(void *params) {
   }
 }
 
+std::vector<WakeWordModel *> MicroWakeWord::get_wake_words() {
+  std::vector<WakeWordModel *> external_wake_word_models;
+  for (auto model : this->wake_word_models_) {
+    if (!model->get_internal_only()) {
+      external_wake_word_models.push_back(model);
+    }
+  }
+  return external_wake_word_models;
+}
+
 void MicroWakeWord::inference_task_(void *params) {
   MicroWakeWord *this_mww = (MicroWakeWord *) params;
 

diff --git a/esphome/components/micro_wake_word/micro_wake_word.h b/esphome/components/micro_wake_word/micro_wake_word.h
@@ -55,7 +55,7 @@ class MicroWakeWord : public Component {
 
   // Intended for the voice assistant component to know which wake words are available
   // Since these are pointers to the WakeWordModel objects, the voice assistant component can enable or disable them
-  const std::vector<WakeWordModel *> &get_wake_words() const { return this->wake_word_models_; }
+  std::vector<WakeWordModel *> get_wake_words();
 
  protected:
   microphone::Microphone *microphone_{nullptr};

diff --git a/esphome/components/voice_assistant/voice_assistant.cpp b/esphome/components/voice_assistant/voice_assistant.cpp
@@ -908,18 +908,17 @@ const Configuration &VoiceAssistant::get_configuration() {
     this->config_.max_active_wake_words = 1;
 
     for (auto &model : this->micro_wake_word_->get_wake_words()) {
-      if (!model->get_internal_only()) {
-        WakeWord wake_word;
-        wake_word.id = model->get_id();
-        wake_word.wake_word = model->get_wake_word();
-        for (const auto &lang : model->get_trained_languages()) {
-          wake_word.trained_languages.push_back(lang);
-        }
-        this->config_.available_wake_words.push_back(std::move(wake_word));
-      }
       if (model->is_enabled()) {
         this->config_.active_wake_words.push_back(model->get_id());
       }
+
+      WakeWord wake_word;
+      wake_word.id = model->get_id();
+      wake_word.wake_word = model->get_wake_word();
+      for (const auto &lang : model->get_trained_languages()) {
+        wake_word.trained_languages.push_back(lang);
+      }
+      this->config_.available_wake_words.push_back(std::move(wake_word));
     }
   } else {
     // No microWakeWord