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

Merge branch 'bugfix/esp_timer_isr_dispatch_test_fail_v4.4' into 'release/v4.4'

Browse Source 
esp_timer: fix ESP_TIMER_ISR dispatch method due to off by one error (v4.4)

See merge request espressif/esp-idf!21027
This commit is contained in:
Marius Vikhammer
2022-11-10 16:44:50 +08:00
parent dde4ba5362 478ffa077c
commit 7b8ce7a3a6
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/esp_timer/test/test_esp_timer.c
View File

@@ -932,7 +932,7 @@ static void timer_isr_callback(void* arg)
int64_t now = esp_timer_get_time(); int64_t now = esp_timer_get_time();
int64_t dt = now - old_time[num_timer]; int64_t dt = now - old_time[num_timer];
old_time[num_timer] = now; old_time[num_timer] = now;
if (num_timer == 1) { if (num_timer == 0) {
esp_rom_printf("(%lld): \t\t\t\t timer ISR, dt: %lld us\n", now, dt); esp_rom_printf("(%lld): \t\t\t\t timer ISR, dt: %lld us\n", now, dt);
assert(xPortInIsrContext()); assert(xPortInIsrContext());
} else { } else {
@@ -944,7 +944,7 @@ static void timer_isr_callback(void* arg)
TEST_CASE("Test ESP_TIMER_ISR dispatch method", "[esp_timer]") TEST_CASE("Test ESP_TIMER_ISR dispatch method", "[esp_timer]")
{ {
TEST_ESP_OK(esp_timer_dump(stdout)); TEST_ESP_OK(esp_timer_dump(stdout));
int timer[2]= {1, 2}; int timer[2]= {0, 1};
const esp_timer_create_args_t periodic_timer1_args = { const esp_timer_create_args_t periodic_timer1_args = {
.callback = &timer_isr_callback, .callback = &timer_isr_callback,
.dispatch_method = ESP_TIMER_ISR, .dispatch_method = ESP_TIMER_ISR,