diff --git a/components/driver/rmt/rmt_common.c b/components/driver/rmt/rmt_common.c index 2a95f4b61f..565080124f 100644 --- a/components/driver/rmt/rmt_common.c +++ b/components/driver/rmt/rmt_common.c @@ -138,17 +138,11 @@ esp_err_t rmt_select_periph_clock(rmt_channel_handle_t chan, rmt_clock_source_t TAG, "get clock source frequency failed"); #if CONFIG_PM_ENABLE - bool need_pm_lock = true; - // to make the RMT work reliable, the source clock must stay alive and unchanged - // driver will create different pm lock for that purpose, according to different clock source - esp_pm_lock_type_t pm_lock_type = ESP_PM_NO_LIGHT_SLEEP; - -#if SOC_RMT_SUPPORT_RC_FAST - if (clk_src == RMT_CLK_SRC_RC_FAST) { - // RC_FAST won't be turn off in sleep and won't change its frequency during DFS - need_pm_lock = false; - } -#endif // SOC_RMT_SUPPORT_RC_FAST + // if DMA is not used, we're using CPU to push the data to the RMT FIFO + // if the CPU frequency goes down, the transfer+encoding scheme could be unstable because CPU can't fill the data in time + // so, choose ESP_PM_CPU_FREQ_MAX lock for non-dma mode + // otherwise, chose lock type based on the clock source + esp_pm_lock_type_t pm_lock_type = chan->dma_chan ? ESP_PM_NO_LIGHT_SLEEP : ESP_PM_CPU_FREQ_MAX; #if SOC_RMT_SUPPORT_APB if (clk_src == RMT_CLK_SRC_APB) { @@ -157,11 +151,9 @@ esp_err_t rmt_select_periph_clock(rmt_channel_handle_t chan, rmt_clock_source_t } #endif // SOC_RMT_SUPPORT_APB - if (need_pm_lock) { - sprintf(chan->pm_lock_name, "rmt_%d_%d", group->group_id, channel_id); // e.g. rmt_0_0 - ret = esp_pm_lock_create(pm_lock_type, 0, chan->pm_lock_name, &chan->pm_lock); - ESP_RETURN_ON_ERROR(ret, TAG, "create pm lock failed"); - } + sprintf(chan->pm_lock_name, "rmt_%d_%d", group->group_id, channel_id); // e.g. rmt_0_0 + ret = esp_pm_lock_create(pm_lock_type, 0, chan->pm_lock_name, &chan->pm_lock); + ESP_RETURN_ON_ERROR(ret, TAG, "create pm lock failed"); #endif // CONFIG_PM_ENABLE // no division for group clock source, to achieve highest resolution diff --git a/components/driver/rmt/rmt_rx.c b/components/driver/rmt/rmt_rx.c index 4d0d61113d..292751e69f 100644 --- a/components/driver/rmt/rmt_rx.c +++ b/components/driver/rmt/rmt_rx.c @@ -215,8 +215,6 @@ esp_err_t rmt_new_rx_channel(const rmt_rx_channel_config_t *config, rmt_channel_ rmt_hal_context_t *hal = &group->hal; int channel_id = rx_channel->base.channel_id; int group_id = group->group_id; - // select the clock source - ESP_GOTO_ON_ERROR(rmt_select_periph_clock(&rx_channel->base, config->clk_src), err, TAG, "set group clock failed"); // reset channel, make sure the RX engine is not working, and events are cleared portENTER_CRITICAL(&group->spinlock); @@ -245,6 +243,8 @@ esp_err_t rmt_new_rx_channel(const rmt_rx_channel_config_t *config, rmt_channel_ ESP_GOTO_ON_ERROR(ret, err, TAG, "install rx interrupt failed"); } + // select the clock source + ESP_GOTO_ON_ERROR(rmt_select_periph_clock(&rx_channel->base, config->clk_src), err, TAG, "set group clock failed"); // set channel clock resolution uint32_t real_div = group->resolution_hz / config->resolution_hz; rmt_ll_rx_set_channel_clock_div(hal->regs, channel_id, real_div); diff --git a/components/driver/rmt/rmt_tx.c b/components/driver/rmt/rmt_tx.c index 8386b492cb..4606f3a88b 100644 --- a/components/driver/rmt/rmt_tx.c +++ b/components/driver/rmt/rmt_tx.c @@ -240,8 +240,6 @@ esp_err_t rmt_new_tx_channel(const rmt_tx_channel_config_t *config, rmt_channel_ rmt_hal_context_t *hal = &group->hal; int channel_id = tx_channel->base.channel_id; int group_id = group->group_id; - // select the clock source - ESP_GOTO_ON_ERROR(rmt_select_periph_clock(&tx_channel->base, config->clk_src), err, TAG, "set group clock failed"); // reset channel, make sure the TX engine is not working, and events are cleared portENTER_CRITICAL(&group->spinlock); @@ -267,6 +265,8 @@ esp_err_t rmt_new_tx_channel(const rmt_tx_channel_config_t *config, rmt_channel_ ESP_GOTO_ON_ERROR(rmt_tx_init_dma_link(tx_channel, config), err, TAG, "install tx DMA failed"); } #endif + // select the clock source + ESP_GOTO_ON_ERROR(rmt_select_periph_clock(&tx_channel->base, config->clk_src), err, TAG, "set group clock failed"); // set channel clock resolution uint32_t real_div = group->resolution_hz / config->resolution_hz; rmt_ll_tx_set_channel_clock_div(hal->regs, channel_id, real_div); diff --git a/components/driver/test_apps/rmt/main/test_rmt_tx.c b/components/driver/test_apps/rmt/main/test_rmt_tx.c index 7305b3a77a..2c81b5820f 100644 --- a/components/driver/test_apps/rmt/main/test_rmt_tx.c +++ b/components/driver/test_apps/rmt/main/test_rmt_tx.c @@ -143,6 +143,10 @@ TEST_CASE("rmt_single_trans_with_dma", "[rmt]") static void test_rmt_ping_pong_trans(size_t mem_block_symbols, bool with_dma) { + const int test_led_num = 10000; + uint8_t *leds_grb = heap_caps_malloc(3 * test_led_num, MALLOC_CAP_INTERNAL | MALLOC_CAP_8BIT); + TEST_ASSERT_NOT_NULL(leds_grb); + rmt_tx_channel_config_t tx_channel_cfg = { .mem_block_symbols = mem_block_symbols, .clk_src = RMT_CLK_SRC_DEFAULT, @@ -162,22 +166,21 @@ static void test_rmt_ping_pong_trans(size_t mem_block_symbols, bool with_dma) TEST_ESP_OK(rmt_enable(tx_channel_multi_leds)); // Mutiple LEDs (ping-pong in the background) - printf("ping pong transmission: light up 100 RGB LEDs\r\n"); + printf("ping pong transmission: light up %d RGB LEDs\r\n", test_led_num); rmt_transmit_config_t transmit_config = { .loop_count = 0, // no loop }; -#define TEST_LED_NUM 100 - uint8_t leds_grb[TEST_LED_NUM * 3] = {}; + // color: Material Design Green-A200 (#69F0AE) - for (int i = 0; i < TEST_LED_NUM * 3; i += 3) { + for (int i = 0; i < test_led_num * 3; i += 3) { leds_grb[i + 0] = 0xF0; leds_grb[i + 1] = 0x69; leds_grb[i + 2] = 0xAE; } printf("start transmission and stop immediately, only a few LEDs are light up\r\n"); - TEST_ESP_OK(rmt_transmit(tx_channel_multi_leds, led_strip_encoder, leds_grb, TEST_LED_NUM * 3, &transmit_config)); + TEST_ESP_OK(rmt_transmit(tx_channel_multi_leds, led_strip_encoder, leds_grb, test_led_num * 3, &transmit_config)); // this second transmission will stay in the queue and shouldn't be dispatched until we restart the tx channel later - TEST_ESP_OK(rmt_transmit(tx_channel_multi_leds, led_strip_encoder, leds_grb, TEST_LED_NUM * 3, &transmit_config)); + TEST_ESP_OK(rmt_transmit(tx_channel_multi_leds, led_strip_encoder, leds_grb, test_led_num * 3, &transmit_config)); esp_rom_delay_us(100); TEST_ESP_OK(rmt_disable(tx_channel_multi_leds)); vTaskDelay(pdTICKS_TO_MS(500)); @@ -187,33 +190,33 @@ static void test_rmt_ping_pong_trans(size_t mem_block_symbols, bool with_dma) // adding extra delay here for visualizing vTaskDelay(pdTICKS_TO_MS(500)); // color: Material Design Pink-A200 (#FF4081) - for (int i = 0; i < TEST_LED_NUM * 3; i += 3) { + for (int i = 0; i < test_led_num * 3; i += 3) { leds_grb[i + 0] = 0x40; leds_grb[i + 1] = 0xFF; leds_grb[i + 2] = 0x81; } - TEST_ESP_OK(rmt_transmit(tx_channel_multi_leds, led_strip_encoder, leds_grb, TEST_LED_NUM * 3, &transmit_config)); + TEST_ESP_OK(rmt_transmit(tx_channel_multi_leds, led_strip_encoder, leds_grb, test_led_num * 3, &transmit_config)); vTaskDelay(pdTICKS_TO_MS(500)); // color: Material Design Orange-900 (#E65100) - for (int i = 0; i < TEST_LED_NUM * 3; i += 3) { + for (int i = 0; i < test_led_num * 3; i += 3) { leds_grb[i + 0] = 0x51; leds_grb[i + 1] = 0xE6; leds_grb[i + 2] = 0x00; } - TEST_ESP_OK(rmt_transmit(tx_channel_multi_leds, led_strip_encoder, leds_grb, TEST_LED_NUM * 3, &transmit_config)); - vTaskDelay(pdTICKS_TO_MS(500)); + TEST_ESP_OK(rmt_transmit(tx_channel_multi_leds, led_strip_encoder, leds_grb, test_led_num * 3, &transmit_config)); + vTaskDelay(pdTICKS_TO_MS(2000)); printf("disable tx channel\r\n"); TEST_ESP_OK(rmt_disable(tx_channel_multi_leds)); printf("remove tx channel and led strip encoder\r\n"); TEST_ESP_OK(rmt_del_channel(tx_channel_multi_leds)); TEST_ESP_OK(rmt_del_encoder(led_strip_encoder)); -#undef TEST_LED_NUM + free(leds_grb); } TEST_CASE("rmt_ping_pong_trans_no_dma", "[rmt]") { - test_rmt_ping_pong_trans(SOC_RMT_MEM_WORDS_PER_CHANNEL, false); + test_rmt_ping_pong_trans(SOC_RMT_MEM_WORDS_PER_CHANNEL * 2, false); } #if SOC_RMT_SUPPORT_DMA @@ -264,15 +267,15 @@ static void test_rmt_trans_done_event(size_t mem_block_symbols, bool with_dma) }; printf("transmit dynamic number of LEDs\r\n"); -#define TEST_LED_NUM 40 - uint8_t leds_grb[TEST_LED_NUM * 3] = {}; + const int test_led_num = 40; + uint8_t leds_grb[test_led_num * 3]; // color: Material Design Purple-800 (6A1B9A) - for (int i = 0; i < TEST_LED_NUM * 3; i += 3) { + for (int i = 0; i < test_led_num * 3; i += 3) { leds_grb[i + 0] = 0x1B; leds_grb[i + 1] = 0x6A; leds_grb[i + 2] = 0x9A; } - for (int i = 1; i <= TEST_LED_NUM; i++) { + for (int i = 1; i <= test_led_num; i++) { expected_encoded_size = 2 + i * 24; // 2 = 1 reset symbol + 1 eof symbol, 24 = 8*3(RGB) TEST_ESP_OK(rmt_transmit(tx_channel_multi_leds, led_strip_encoder, leds_grb, i * 3, &transmit_config)); // wait for the transmission finished and recycled @@ -284,7 +287,6 @@ static void test_rmt_trans_done_event(size_t mem_block_symbols, bool with_dma) printf("remove tx channel and led strip encoder\r\n"); TEST_ESP_OK(rmt_del_channel(tx_channel_multi_leds)); TEST_ESP_OK(rmt_del_encoder(led_strip_encoder)); -#undef TEST_LED_NUM } TEST_CASE("rmt_trans_done_event_callback_no_dma", "[rmt]") @@ -341,13 +343,13 @@ static void test_rmt_loop_trans(size_t mem_block_symbols, bool with_dma) rmt_transmit_config_t transmit_config = { .loop_count = 5, }; -#define TEST_LED_NUM 3 - uint8_t leds_grb[TEST_LED_NUM * 3] = {}; - for (int i = 0; i < TEST_LED_NUM * 3; i++) { + const int test_led_num = 3; + uint8_t leds_grb[test_led_num * 3]; + for (int i = 0; i < test_led_num * 3; i++) { leds_grb[i] = 0x10 + i; } - expected_encoded_size = 2 + 24 * TEST_LED_NUM; - TEST_ESP_OK(rmt_transmit(tx_channel_multi_leds, led_strip_encoder, leds_grb, TEST_LED_NUM * 3, &transmit_config)); + expected_encoded_size = 2 + 24 * test_led_num; + TEST_ESP_OK(rmt_transmit(tx_channel_multi_leds, led_strip_encoder, leds_grb, test_led_num * 3, &transmit_config)); vTaskDelay(pdTICKS_TO_MS(100)); printf("wait for loop transactions done\r\n"); @@ -357,7 +359,6 @@ static void test_rmt_loop_trans(size_t mem_block_symbols, bool with_dma) printf("remove tx channel and led strip encoder\r\n"); TEST_ESP_OK(rmt_del_channel(tx_channel_multi_leds)); TEST_ESP_OK(rmt_del_encoder(led_strip_encoder)); -#undef TEST_LED_NUM } TEST_CASE("rmt_loop_trans_no_dma", "[rmt]") @@ -529,12 +530,11 @@ static bool test_rmt_tx_done_cb_record_time(rmt_channel_handle_t channel, const return false; } -static void test_rmt_multi_channels_trans(size_t channel0_mem_block_symbols, size_t channel1_mem_block_symbols, bool channel0_with_dma, bool channel1_with_dma) -{ -#define TEST_RMT_CHANS 2 -#define TEST_LED_NUM 1 #define TEST_STOP_TIME_NO_SYNCHRO_DELTA 300 #define TEST_STOP_TIME_SYNCHRO_DELTA 60 +static void test_rmt_multi_channels_trans(size_t channel0_mem_block_symbols, size_t channel1_mem_block_symbols, bool channel0_with_dma, bool channel1_with_dma) +{ + const int test_led_num = 1; rmt_tx_channel_config_t tx_channel_cfg = { .clk_src = RMT_CLK_SRC_DEFAULT, .resolution_hz = 10000000, // 10MHz, 1 tick = 0.1us (led strip needs a high resolution) @@ -542,11 +542,12 @@ static void test_rmt_multi_channels_trans(size_t channel0_mem_block_symbols, siz .intr_priority = 3 }; printf("install tx channels\r\n"); - rmt_channel_handle_t tx_channels[TEST_RMT_CHANS] = {NULL}; - int gpio_nums[TEST_RMT_CHANS] = {0, 2}; - size_t mem_blk_syms[TEST_RMT_CHANS] = {channel0_mem_block_symbols, channel1_mem_block_symbols}; - bool dma_flags[TEST_RMT_CHANS] = {channel0_with_dma, channel1_with_dma}; - for (int i = 0; i < TEST_RMT_CHANS; i++) { + rmt_channel_handle_t tx_channels[] = {NULL, NULL}; + const int test_rmt_chans = sizeof(tx_channels) / sizeof(tx_channels[0]); + int gpio_nums[] = {0, 2}; + size_t mem_blk_syms[] = {channel0_mem_block_symbols, channel1_mem_block_symbols}; + bool dma_flags[] = {channel0_with_dma, channel1_with_dma}; + for (int i = 0; i < test_rmt_chans; i++) { tx_channel_cfg.gpio_num = gpio_nums[i]; tx_channel_cfg.mem_block_symbols = mem_blk_syms[i]; tx_channel_cfg.flags.with_dma = dma_flags[i]; @@ -554,8 +555,8 @@ static void test_rmt_multi_channels_trans(size_t channel0_mem_block_symbols, siz } printf("install led strip encoders\r\n"); - rmt_encoder_handle_t led_strip_encoders[TEST_RMT_CHANS] = {NULL}; - for (int i = 0; i < TEST_RMT_CHANS; i++) { + rmt_encoder_handle_t led_strip_encoders[test_rmt_chans]; + for (int i = 0; i < test_rmt_chans; i++) { TEST_ESP_OK(test_rmt_new_led_strip_encoder(&led_strip_encoders[i])); } @@ -563,19 +564,19 @@ static void test_rmt_multi_channels_trans(size_t channel0_mem_block_symbols, siz rmt_tx_event_callbacks_t cbs = { .on_trans_done = test_rmt_tx_done_cb_record_time }; - int64_t record_stop_time[TEST_RMT_CHANS] = {}; - for (int i = 0; i < TEST_RMT_CHANS; i++) { + int64_t record_stop_time[test_rmt_chans]; + for (int i = 0; i < test_rmt_chans; i++) { TEST_ESP_OK(rmt_tx_register_event_callbacks(tx_channels[i], &cbs, &record_stop_time[i])); } printf("enable tx channels\r\n"); - for (int i = 0; i < TEST_RMT_CHANS; i++) { + for (int i = 0; i < test_rmt_chans; i++) { TEST_ESP_OK(rmt_enable(tx_channels[i])); } - uint8_t leds_grb[TEST_LED_NUM * 3] = {}; + uint8_t leds_grb[test_led_num * 3]; // color: Material Design Green-A200 (#69F0AE) - for (int i = 0; i < TEST_LED_NUM * 3; i += 3) { + for (int i = 0; i < test_led_num * 3; i += 3) { leds_grb[i + 0] = 0xF0; leds_grb[i + 1] = 0x69; leds_grb[i + 2] = 0xAE; @@ -586,14 +587,14 @@ static void test_rmt_multi_channels_trans(size_t channel0_mem_block_symbols, siz .loop_count = 0, // no loop }; // the channels should work independently, without synchronization - for (int i = 0; i < TEST_RMT_CHANS; i++) { - TEST_ESP_OK(rmt_transmit(tx_channels[i], led_strip_encoders[i], leds_grb, TEST_LED_NUM * 3, &transmit_config)); + for (int i = 0; i < test_rmt_chans; i++) { + TEST_ESP_OK(rmt_transmit(tx_channels[i], led_strip_encoders[i], leds_grb, test_led_num * 3, &transmit_config)); } - for (int i = 0; i < TEST_RMT_CHANS; i++) { + for (int i = 0; i < test_rmt_chans; i++) { TEST_ESP_OK(rmt_tx_wait_all_done(tx_channels[i], -1)); } printf("stop time (no sync):\r\n"); - for (int i = 0; i < TEST_RMT_CHANS; i++) { + for (int i = 0; i < test_rmt_chans; i++) { printf("\t%lld\r\n", record_stop_time[i]); } // without synchronization, there will be obvious time shift @@ -603,7 +604,7 @@ static void test_rmt_multi_channels_trans(size_t channel0_mem_block_symbols, siz rmt_sync_manager_handle_t synchro = NULL; rmt_sync_manager_config_t synchro_config = { .tx_channel_array = tx_channels, - .array_size = TEST_RMT_CHANS, + .array_size = test_rmt_chans, }; #if SOC_RMT_SUPPORT_TX_SYNCHRO TEST_ESP_OK(rmt_new_sync_manager(&synchro_config, &synchro)); @@ -613,16 +614,16 @@ static void test_rmt_multi_channels_trans(size_t channel0_mem_block_symbols, siz #if SOC_RMT_SUPPORT_TX_SYNCHRO printf("transmit with synchronization\r\n"); - for (int i = 0; i < TEST_RMT_CHANS; i++) { - TEST_ESP_OK(rmt_transmit(tx_channels[i], led_strip_encoders[i], leds_grb, TEST_LED_NUM * 3, &transmit_config)); + for (int i = 0; i < test_rmt_chans; i++) { + TEST_ESP_OK(rmt_transmit(tx_channels[i], led_strip_encoders[i], leds_grb, test_led_num * 3, &transmit_config)); // manually introduce the delay, to show the managed channels are indeed in sync vTaskDelay(pdMS_TO_TICKS(10)); } - for (int i = 0; i < TEST_RMT_CHANS; i++) { + for (int i = 0; i < test_rmt_chans; i++) { TEST_ESP_OK(rmt_tx_wait_all_done(tx_channels[i], -1)); } printf("stop time (with sync):\r\n"); - for (int i = 0; i < TEST_RMT_CHANS; i++) { + for (int i = 0; i < test_rmt_chans; i++) { printf("\t%lld\r\n", record_stop_time[i]); } // because of synchronization, the managed channels will stop at the same time @@ -632,16 +633,16 @@ static void test_rmt_multi_channels_trans(size_t channel0_mem_block_symbols, siz printf("reset sync manager\r\n"); TEST_ESP_OK(rmt_sync_reset(synchro)); printf("transmit with synchronization again\r\n"); - for (int i = 0; i < TEST_RMT_CHANS; i++) { - TEST_ESP_OK(rmt_transmit(tx_channels[i], led_strip_encoders[i], leds_grb, TEST_LED_NUM * 3, &transmit_config)); + for (int i = 0; i < test_rmt_chans; i++) { + TEST_ESP_OK(rmt_transmit(tx_channels[i], led_strip_encoders[i], leds_grb, test_led_num * 3, &transmit_config)); // manually introduce the delay, ensure the channels get synchronization vTaskDelay(pdMS_TO_TICKS(10)); } - for (int i = 0; i < TEST_RMT_CHANS; i++) { + for (int i = 0; i < test_rmt_chans; i++) { TEST_ESP_OK(rmt_tx_wait_all_done(tx_channels[i], -1)); } printf("stop time (with sync):\r\n"); - for (int i = 0; i < TEST_RMT_CHANS; i++) { + for (int i = 0; i < test_rmt_chans; i++) { printf("\t%lld\r\n", record_stop_time[i]); } TEST_ASSERT_INT64_WITHIN(TEST_STOP_TIME_SYNCHRO_DELTA, record_stop_time[0], record_stop_time[1]); @@ -651,18 +652,16 @@ static void test_rmt_multi_channels_trans(size_t channel0_mem_block_symbols, siz #endif // SOC_RMT_SUPPORT_TX_SYNCHRO printf("disable tx channels\r\n"); - for (int i = 0; i < TEST_RMT_CHANS; i++) { + for (int i = 0; i < test_rmt_chans; i++) { TEST_ESP_OK(rmt_disable(tx_channels[i])); } printf("delete channels and encoders\r\n"); - for (int i = 0; i < TEST_RMT_CHANS; i++) { + for (int i = 0; i < test_rmt_chans; i++) { TEST_ESP_OK(rmt_del_channel(tx_channels[i])); } - for (int i = 0; i < TEST_RMT_CHANS; i++) { + for (int i = 0; i < test_rmt_chans; i++) { TEST_ESP_OK(rmt_del_encoder(led_strip_encoders[i])); } -#undef TEST_LED_NUM -#undef TEST_RMT_CHANS } TEST_CASE("rmt_multi_channels_trans_no_dma", "[rmt]")