espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-03 20:54:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/use_esp_rom_delay_us_to_test_the_accuracy_of_gptimer_v5.1' into 'release/v5.1'

Browse Source 
refactor(driver/gptimer): replace vTaskDelay with esp_rom_delay_us in test_apps(v5.1)

See merge request espressif/esp-idf!24724
This commit is contained in:
morris
2023-07-13 17:38:40 +08:00
parent d8db9235ff 649541e6e3
commit 9021fab579
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
components/driver/test_apps/gptimer/main/test_gptimer.c
View File

@@ -84,44 +84,44 @@ TEST_CASE("gptimer_wallclock_with_various_clock_sources", "[gptimer]")
for (int i = 0; i < SOC_TIMER_GROUP_TOTAL_TIMERS; i++) { for (int i = 0; i < SOC_TIMER_GROUP_TOTAL_TIMERS; i++) {
TEST_ESP_OK(gptimer_start(timers[i])); TEST_ESP_OK(gptimer_start(timers[i]));
} }
vTaskDelay(pdMS_TO_TICKS(20)); // 20ms = 20_000 ticks esp_rom_delay_us(20 * 1000); // 20ms = 20_000 ticks
uint64_t value = 0; uint64_t value = 0;
for (int i = 0; i < SOC_TIMER_GROUP_TOTAL_TIMERS; i++) { for (int i = 0; i < SOC_TIMER_GROUP_TOTAL_TIMERS; i++) {
TEST_ESP_OK(gptimer_get_raw_count(timers[i], &value)); TEST_ESP_OK(gptimer_get_raw_count(timers[i], &value));
// convert the raw count to us // convert the raw count to us
value = value * 1000000 / timer_resolution_hz[i]; value = value * 1000000 / timer_resolution_hz[i];
TEST_ASSERT_UINT_WITHIN(1100, 20000, value); TEST_ASSERT_UINT_WITHIN(300, 20000, value);
} }
printf("stop timers\r\n"); printf("stop timers\r\n");
for (int i = 0; i < SOC_TIMER_GROUP_TOTAL_TIMERS; i++) { for (int i = 0; i < SOC_TIMER_GROUP_TOTAL_TIMERS; i++) {
TEST_ESP_OK(gptimer_stop(timers[i])); TEST_ESP_OK(gptimer_stop(timers[i]));
} }
printf("check whether timers have stopped\r\n"); printf("check whether timers have stopped\r\n");
vTaskDelay(pdMS_TO_TICKS(20)); esp_rom_delay_us(20 * 1000);
for (int i = 0; i < SOC_TIMER_GROUP_TOTAL_TIMERS; i++) { for (int i = 0; i < SOC_TIMER_GROUP_TOTAL_TIMERS; i++) {
TEST_ESP_OK(gptimer_get_raw_count(timers[i], &value)); TEST_ESP_OK(gptimer_get_raw_count(timers[i], &value));
printf("get raw count of gptimer %d: %llu\r\n", i, value); printf("get raw count of gptimer %d: %llu\r\n", i, value);
// convert the raw count to us // convert the raw count to us
value = value * 1000000 / timer_resolution_hz[i]; value = value * 1000000 / timer_resolution_hz[i];
TEST_ASSERT_UINT_WITHIN(1000, 20000, value); TEST_ASSERT_UINT_WITHIN(300, 20000, value);
} }
printf("restart timers\r\n"); printf("restart timers\r\n");
for (int i = 0; i < SOC_TIMER_GROUP_TOTAL_TIMERS; i++) { for (int i = 0; i < SOC_TIMER_GROUP_TOTAL_TIMERS; i++) {
TEST_ESP_OK(gptimer_start(timers[i])); TEST_ESP_OK(gptimer_start(timers[i]));
} }
vTaskDelay(pdMS_TO_TICKS(20)); esp_rom_delay_us(20 * 1000);
printf("stop timers again\r\n"); printf("stop timers again\r\n");
for (int i = 0; i < SOC_TIMER_GROUP_TOTAL_TIMERS; i++) { for (int i = 0; i < SOC_TIMER_GROUP_TOTAL_TIMERS; i++) {
TEST_ESP_OK(gptimer_stop(timers[i])); TEST_ESP_OK(gptimer_stop(timers[i]));
} }
printf("check whether timers have stopped\r\n"); printf("check whether timers have stopped\r\n");
vTaskDelay(pdMS_TO_TICKS(20)); esp_rom_delay_us(20 * 1000);
for (int i = 0; i < SOC_TIMER_GROUP_TOTAL_TIMERS; i++) { for (int i = 0; i < SOC_TIMER_GROUP_TOTAL_TIMERS; i++) {
TEST_ESP_OK(gptimer_get_raw_count(timers[i], &value)); TEST_ESP_OK(gptimer_get_raw_count(timers[i], &value));
printf("get raw count of gptimer %d: %llu\r\n", i, value); printf("get raw count of gptimer %d: %llu\r\n", i, value);
// convert the raw count to us // convert the raw count to us
value = value * 1000000 / timer_resolution_hz[i]; value = value * 1000000 / timer_resolution_hz[i];
TEST_ASSERT_UINT_WITHIN(2500, 40000, value); TEST_ASSERT_UINT_WITHIN(600, 40000, value);
} }
printf("disable timers\r\n"); printf("disable timers\r\n");
for (int i = 0; i < SOC_TIMER_GROUP_TOTAL_TIMERS; i++) { for (int i = 0; i < SOC_TIMER_GROUP_TOTAL_TIMERS; i++) {
@@ -141,7 +141,7 @@ TEST_CASE("gptimer_wallclock_with_various_clock_sources", "[gptimer]")
#if CONFIG_PM_ENABLE #if CONFIG_PM_ENABLE
#define GPTIMER_STOP_ON_ALARM_COUNT_DELTA 150 #define GPTIMER_STOP_ON_ALARM_COUNT_DELTA 150
#else #else
#define GPTIMER_STOP_ON_ALARM_COUNT_DELTA 50 #define GPTIMER_STOP_ON_ALARM_COUNT_DELTA 30
#endif // CONFIG_PM_ENABLE #endif // CONFIG_PM_ENABLE
TEST_ALARM_CALLBACK_ATTR static bool test_gptimer_alarm_stop_callback(gptimer_handle_t timer, const gptimer_alarm_event_data_t *edata, void *user_data) TEST_ALARM_CALLBACK_ATTR static bool test_gptimer_alarm_stop_callback(gptimer_handle_t timer, const gptimer_alarm_event_data_t *edata, void *user_data)
@@ -226,7 +226,7 @@ TEST_CASE("gptimer_stop_on_alarm", "[gptimer]")
#if CONFIG_PM_ENABLE #if CONFIG_PM_ENABLE
#define GPTIMER_AUTO_RELOAD_ON_ALARM_COUNT_DELTA 200 #define GPTIMER_AUTO_RELOAD_ON_ALARM_COUNT_DELTA 200
#else #else
#define GPTIMER_AUTO_RELOAD_ON_ALARM_COUNT_DELTA 30 #define GPTIMER_AUTO_RELOAD_ON_ALARM_COUNT_DELTA 20
#endif // CONFIG_PM_ENABLE #endif // CONFIG_PM_ENABLE
TEST_ALARM_CALLBACK_ATTR static bool test_gptimer_alarm_reload_callback(gptimer_handle_t timer, const gptimer_alarm_event_data_t *edata, void *user_data) TEST_ALARM_CALLBACK_ATTR static bool test_gptimer_alarm_reload_callback(gptimer_handle_t timer, const gptimer_alarm_event_data_t *edata, void *user_data)