From a1307f0f40ed0abcb573f63b283296f7b36bb0e0 Mon Sep 17 00:00:00 2001 From: "J. Nick Koston" Date: Thu, 10 Sep 2026 18:25:42 -0500 Subject: [PATCH] [remote_transmitter] Drop trailing underscore from static RMT callback --- esphome/components/remote_transmitter/remote_transmitter.h | 2 +- .../remote_transmitter/remote_transmitter_rmt.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/esphome/components/remote_transmitter/remote_transmitter.h b/esphome/components/remote_transmitter/remote_transmitter.h index 2beb19cecf..0f06f33402 100644 --- a/esphome/components/remote_transmitter/remote_transmitter.h +++ b/esphome/components/remote_transmitter/remote_transmitter.h @@ -176,7 +176,7 @@ class RemoteTransmitterComponent final : public remote_base::RemoteTransmitterBa void wait_for_rmt_(); #if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 5, 1) - static bool tx_done_callback_(rmt_channel_handle_t channel, const rmt_tx_done_event_data_t *event, void *arg); + static bool tx_done_callback(rmt_channel_handle_t channel, const rmt_tx_done_event_data_t *event, void *arg); size_t encode_symbols_(rmt_symbol_half_t *out, uint32_t send_wait, uint32_t *offset); bool encode_frame_(RmtFramePtr &frame, size_t count, uint32_t send_times, uint32_t send_wait); void submit_(RmtTxSlot &slot); diff --git a/esphome/components/remote_transmitter/remote_transmitter_rmt.cpp b/esphome/components/remote_transmitter/remote_transmitter_rmt.cpp index 2ddaad4c9b..62bc8cd5f1 100644 --- a/esphome/components/remote_transmitter/remote_transmitter_rmt.cpp +++ b/esphome/components/remote_transmitter/remote_transmitter_rmt.cpp @@ -78,8 +78,8 @@ static RmtFrame *new_frame(uint32_t capacity) { return frame; } -bool IRAM_ATTR HOT RemoteTransmitterComponent::tx_done_callback_(rmt_channel_handle_t channel, - const rmt_tx_done_event_data_t *event, void *arg) { +bool IRAM_ATTR HOT RemoteTransmitterComponent::tx_done_callback(rmt_channel_handle_t channel, + const rmt_tx_done_event_data_t *event, void *arg) { auto *self = static_cast(arg); self->done_count_++; self->enable_loop_soon_any_context(); @@ -210,7 +210,7 @@ void RemoteTransmitterComponent::configure_rmt_() { #if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 5, 1) rmt_tx_event_callbacks_t callbacks; memset(&callbacks, 0, sizeof(callbacks)); - callbacks.on_trans_done = tx_done_callback_; + callbacks.on_trans_done = tx_done_callback; error = rmt_tx_register_event_callbacks(this->channel_, &callbacks, this); if (error != ESP_OK) { this->error_code_ = error;