From 1b49e79bf8da3f10dc19c31b33f3ff268f7ee763 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Fri, 9 Oct 2026 15:35:38 -1000
Subject: [PATCH] [microphone] Build on_data with build_callback_automation
 (#20451)

---
 esphome/components/microphone/__init__.py  | 18 ++++--------------
 esphome/components/microphone/automation.h | 17 -----------------
 2 files changed, 4 insertions(+), 31 deletions(-)
 delete mode 100644 esphome/components/microphone/automation.h

diff --git a/esphome/components/microphone/__init__.py b/esphome/components/microphone/__init__.py
index 6fa14cdd8b..a83827ef5d 100644
--- a/esphome/components/microphone/__init__.py
+++ b/esphome/components/microphone/__init__.py
@@ -12,7 +12,6 @@ from esphome.const import (
     CONF_ID,
     CONF_MICROPHONE,
     CONF_ON_DATA,
-    CONF_TRIGGER_ID,
 )
 from esphome.core import CORE
 from esphome.coroutine import CoroPriority, coroutine_with_priority
@@ -30,17 +29,12 @@ microphone_ns = cg.esphome_ns.namespace("microphone")
 Microphone = microphone_ns.class_("Microphone")
 MicrophoneSource = microphone_ns.class_("MicrophoneSource")
 
-DataTrigger = microphone_ns.class_(
-    "DataTrigger",
-    automation.Trigger.template(cg.std_vector.template(cg.uint8).operator("ref")),
-)
-
 
 async def setup_microphone_core_(var: MockObj, config: ConfigType) -> None:
     for conf in config.get(CONF_ON_DATA, []):
-        trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], var)
-        await automation.build_automation(
-            trigger,
+        await automation.build_callback_automation(
+            var,
+            "add_data_callback",
             [(cg.std_vector.template(cg.uint8).operator("ref").operator("const"), "x")],
             conf,
         )
@@ -54,11 +48,7 @@ async def register_microphone(var: MockObj, config: ConfigType) -> None:
 
 MICROPHONE_SCHEMA = cv.Schema.extend(audio.AUDIO_COMPONENT_SCHEMA).extend(
     {
-        cv.Optional(CONF_ON_DATA): automation.validate_automation(
-            {
-                cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(DataTrigger),
-            }
-        ),
+        cv.Optional(CONF_ON_DATA): automation.validate_automation({}),
     }
 )
 
diff --git a/esphome/components/microphone/automation.h b/esphome/components/microphone/automation.h
deleted file mode 100644
index 0fac18d828..0000000000
--- a/esphome/components/microphone/automation.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#pragma once
-
-#include "esphome/core/automation.h"
-#include "microphone.h"
-
-#include <vector>
-
-namespace esphome::microphone {
-
-class DataTrigger final : public Trigger<const std::vector<uint8_t> &> {
- public:
-  explicit DataTrigger(Microphone *mic) {
-    mic->add_data_callback([this](const std::vector<uint8_t> &data) { this->trigger(data); });
-  }
-};
-
-}  // namespace esphome::microphone