Upstream/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2024-12-03 13:34:01 +01:00
Code Issues Projects Releases Wiki Activity

Trigger a new receive in the rmt callback

Browse Source
This commit is contained in:
Jonathan Swoboda 2024-11-12 07:24:22 -05:00
parent 0ff29636e4
commit f296a6c991
3 changed files with 35 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
esphome/components/remote_receiver/remote_receiver.h
View File

@ -29,11 +29,15 @@ struct RemoteReceiverComponentStore {
uint32_t filter_us{10}; uint32_t filter_us{10};
ISRInternalGPIOPin pin; ISRInternalGPIOPin pin;
#elif defined(USE_ESP32) #elif defined(USE_ESP32)
volatile bool error{false}; uint8_t *buffer{nullptr};
volatile bool done{false}; volatile uint32_t buffer_write_at{0};
uint32_t *buffer{nullptr}; uint32_t buffer_read_at{0};
uint32_t buffer_size{1000};
uint32_t max_size{0};
rmt_rx_done_event_data_t data; rmt_rx_done_event_data_t data;
rmt_receive_config_t config; rmt_receive_config_t config;
rmt_channel_handle_t channel;
esp_err_t error{ESP_OK};
#endif #endif
}; };

35
esphome/components/remote_receiver/remote_receiver_esp32.cpp
View File

@ -11,8 +11,15 @@ static const char *const TAG = "remote_receiver.esp32";
static bool IRAM_ATTR HOT rmt_callback(rmt_channel_handle_t channel, const rmt_rx_done_event_data_t *data, static bool IRAM_ATTR HOT rmt_callback(rmt_channel_handle_t channel, const rmt_rx_done_event_data_t *data,
void *user_data) { void *user_data) {
RemoteReceiverComponentStore *store = (RemoteReceiverComponentStore *) user_data; RemoteReceiverComponentStore *store = (RemoteReceiverComponentStore *) user_data;
store->data = *data; uint32_t next =
store->done = true; store->buffer_write_at + sizeof(rmt_rx_done_event_data_t) + data->num_symbols * sizeof(rmt_symbol_word_t);
if ((next + store->max_size) > store->buffer_size) {
next = 0;
}
store->error = rmt_receive(store->channel, store->buffer + next + sizeof(rmt_rx_done_event_data_t),
sizeof(rmt_symbol_word_t) * 64 * 4, &store->config);
*(rmt_rx_done_event_data_t *) (store->buffer + store->buffer_write_at) = *data;
store->buffer_write_at = next;
return false; return false;
} }
@ -56,7 +63,12 @@ void RemoteReceiverComponent::setup() {
return; return;
} }
this->store_.buffer = new uint32_t[this->buffer_size_ / 4]; this->store_.channel = this->channel_;
this->store_.buffer = (uint8_t *) new uint32_t[this->buffer_size_ / 4];
this->store_.buffer_write_at = 0;
this->store_.buffer_read_at = 0;
this->store_.buffer_size = this->buffer_size_;
this->store_.max_size = 64 * this->mem_block_num_ * sizeof(rmt_symbol_word_t) + sizeof(rmt_rx_done_event_data_t);
error = rmt_receive(this->channel_, this->store_.buffer, 64 * this->mem_block_num_ * sizeof(rmt_symbol_word_t), error = rmt_receive(this->channel_, this->store_.buffer, 64 * this->mem_block_num_ * sizeof(rmt_symbol_word_t),
&this->store_.config); &this->store_.config);
if (error != ESP_OK) { if (error != ESP_OK) {
@ -87,10 +99,19 @@ void RemoteReceiverComponent::dump_config() {
} }
void RemoteReceiverComponent::loop() { void RemoteReceiverComponent::loop() {
if (this->store_.done) { if (this->store_.error != ESP_OK) {
this->decode_rmt_((rmt_symbol_word_t *) this->store_.buffer, this->store_.data.num_symbols); this->error_code_ = this->store_.error;
this->store_.done = false; this->error_string_ = "in rmt_callback";
rmt_receive(this->channel_, this->store_.buffer, sizeof(rmt_symbol_word_t) * 64 * 4, &this->store_.config); this->mark_failed();
return;
}
if (this->store_.buffer_write_at != this->store_.buffer_read_at) {
rmt_rx_done_event_data_t *data = (rmt_rx_done_event_data_t *) (this->store_.buffer + this->store_.buffer_read_at);
this->decode_rmt_(data->received_symbols, data->num_symbols);
this->store_.buffer_read_at += sizeof(rmt_rx_done_event_data_t) + data->num_symbols * sizeof(rmt_symbol_word_t);
if ((this->store_.buffer_read_at + this->store_.max_size) > this->store_.buffer_size) {
this->store_.buffer_read_at = 0;
}
if (!this->temp_.empty()) { if (!this->temp_.empty()) {
this->temp_.push_back(-this->idle_us_); this->temp_.push_back(-this->idle_us_);
this->call_listeners_dumpers_(); this->call_listeners_dumpers_();

2
esphome/components/remote_transmitter/remote_transmitter_esp32.cpp
View File

@ -70,8 +70,6 @@ void RemoteTransmitterComponent::configure_rmt_() {
this->mark_failed(); this->mark_failed();
return; return;
} }
// TODO: Carrier
} }
void RemoteTransmitterComponent::send_internal(uint32_t send_times, uint32_t send_wait) { void RemoteTransmitterComponent::send_internal(uint32_t send_times, uint32_t send_wait) {