mirror of
https://github.com/espressif/esp-idf.git
synced 2026-04-27 19:13:21 +00:00
fix(rmt): treat loop once as no loop
This commit is contained in:
committed by
Chen Ji Chang
parent
4b09dbc720
commit
99bae3a449
@@ -522,7 +522,7 @@ esp_err_t rmt_transmit(rmt_channel_handle_t channel, rmt_encoder_t *encoder, con
|
||||
ESP_RETURN_ON_FALSE(channel && encoder && payload && payload_bytes && config, ESP_ERR_INVALID_ARG, TAG, "invalid argument");
|
||||
ESP_RETURN_ON_FALSE(channel->direction == RMT_CHANNEL_DIRECTION_TX, ESP_ERR_INVALID_ARG, TAG, "invalid channel direction");
|
||||
#if !SOC_RMT_SUPPORT_TX_LOOP_COUNT
|
||||
ESP_RETURN_ON_FALSE(config->loop_count <= 0, ESP_ERR_NOT_SUPPORTED, TAG, "loop count is not supported");
|
||||
ESP_RETURN_ON_FALSE(config->loop_count <= 1, ESP_ERR_NOT_SUPPORTED, TAG, "loop count is not supported");
|
||||
#endif // !SOC_RMT_SUPPORT_TX_LOOP_COUNT
|
||||
#if CONFIG_RMT_ISR_IRAM_SAFE
|
||||
// payload is retrieved by the encoder, we should make sure it's still accessible even when the cache is disabled
|
||||
@@ -547,7 +547,8 @@ esp_err_t rmt_transmit(rmt_channel_handle_t channel, rmt_encoder_t *encoder, con
|
||||
t->encoder = encoder;
|
||||
t->payload = payload;
|
||||
t->payload_bytes = payload_bytes;
|
||||
t->loop_count = config->loop_count;
|
||||
// treat loop_count == 1 as no loop
|
||||
t->loop_count = config->loop_count == 1 ? 0 : config->loop_count;
|
||||
t->remain_loop_count = t->loop_count;
|
||||
t->flags.eot_level = config->flags.eot_level;
|
||||
|
||||
@@ -642,7 +643,6 @@ static size_t IRAM_ATTR rmt_encode_check_result(rmt_tx_channel_t *tx_chan, rmt_t
|
||||
rmt_encoder_handle_t encoder = t->encoder;
|
||||
size_t encoded_symbols = encoder->encode(encoder, &tx_chan->base, t->payload, t->payload_bytes, &encode_state);
|
||||
bool is_mem_full = encode_state & RMT_ENCODING_MEM_FULL;
|
||||
bool need_eof_mark = (encode_state & RMT_ENCODING_WITH_EOF) == 0;
|
||||
|
||||
if (encode_state & RMT_ENCODING_COMPLETE) {
|
||||
t->flags.encoding_done = true;
|
||||
@@ -656,7 +656,7 @@ static size_t IRAM_ATTR rmt_encode_check_result(rmt_tx_channel_t *tx_chan, rmt_t
|
||||
// for loop transaction, the memory block should accommodate all encoded RMT symbols and an extra EOF symbol
|
||||
if (t->loop_count != 0) {
|
||||
size_t limit_symbols = tx_chan->base.mem_block_num * SOC_RMT_MEM_WORDS_PER_CHANNEL;
|
||||
if (unlikely(encoded_symbols > limit_symbols || (encoded_symbols == limit_symbols && is_mem_full && need_eof_mark))) {
|
||||
if (unlikely(encoded_symbols > limit_symbols || (encoded_symbols == limit_symbols && is_mem_full))) {
|
||||
ESP_DRAM_LOGE(TAG, "encoding artifacts can't exceed hw memory block for loop transmission");
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user