diff options
| author | Jonathan Hogg <me@jonathanhogg.com> | 2021-06-24 15:34:16 +0100 |
|---|---|---|
| committer | Damien George <damien@micropython.org> | 2021-06-25 12:05:12 +1000 |
| commit | 30422ca7c24f02ea34fdbc61466d5fb4baa0af8a (patch) | |
| tree | 15af917bf43b7f645e86bc07b6eb584daa7971dc | |
| parent | 180c54d6cc4e744082f7f76f484646db47d25adb (diff) | |
esp32/esp32_rmt: Fix RMT looping in newer IDF versions.
When looping, now disable the TX interrupt after calling rmt_write_items()
function to handle change in IDF behaviour (since v4.1). Also check length
of pulses to ensure it fits hardware limit.
Fixes issue #7403.
| -rw-r--r-- | ports/esp32/esp32_rmt.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/ports/esp32/esp32_rmt.c b/ports/esp32/esp32_rmt.c index 9619b1dd5..8c8f0f2e0 100644 --- a/ports/esp32/esp32_rmt.c +++ b/ports/esp32/esp32_rmt.c @@ -218,6 +218,10 @@ STATIC mp_obj_t esp32_rmt_write_pulses(size_t n_args, const mp_obj_t *pos_args, mp_obj_get_array(pulses, &pulses_length, &pulses_ptr); mp_uint_t num_items = (pulses_length / 2) + (pulses_length % 2); + if (self->loop_en && num_items > 63) { + mp_raise_ValueError(MP_ERROR_TEXT("too many pulses for loop")); + } + if (num_items > self->num_items) { self->items = (rmt_item32_t *)m_realloc(self->items, num_items * sizeof(rmt_item32_t *)); self->num_items = num_items; @@ -241,12 +245,12 @@ STATIC mp_obj_t esp32_rmt_write_pulses(size_t n_args, const mp_obj_t *pos_args, check_esp_err(rmt_set_tx_loop_mode(self->channel_id, false)); } check_esp_err(rmt_wait_tx_done(self->channel_id, portMAX_DELAY)); - check_esp_err(rmt_set_tx_intr_en(self->channel_id, false)); } check_esp_err(rmt_write_items(self->channel_id, self->items, num_items, false /* non-blocking */)); if (self->loop_en) { + check_esp_err(rmt_set_tx_intr_en(self->channel_id, false)); check_esp_err(rmt_set_tx_loop_mode(self->channel_id, true)); } |