mirror
/
esp-idf
kopia lustrzana https://github.com/espressif/esp-idf
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Merge branch 'bugfix/ci_ut_esp_timer_isr_dispath_method_is_not_blocked' into 'master' 

esp_timer: Fix Test ESP_TIMER_ISR dispatch method is not blocked

Closes IDFCI-470

See merge request espressif/esp-idf!12484
pull/6718/head
Angus Gratton 2021-02-24 10:07:47 +00:00
rodzic 7ef60b8bde 7bbf4a3422
commit a38b2c2773
1 zmienionych plików z 6 dodań i 6 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

12
components/esp_timer/src/esp_timer.c
Wyświetl plik

@ -568,16 +568,16 @@ esp_err_t esp_timer_dump(FILE* stream)
timer_list_unlock(dispatch_method);
}
fprintf(stream, "Timer stats:\n");
if (stream != NULL) {
fprintf(stream, "Timer stats:\n");
#if WITH_PROFILING
fprintf(stream, "%-20s %-10s %-12s %-12s %-12s %-12s %-12s\n",
"Name", "Period", "Alarm", "Times_armed", "Times_trigg", "Times_skip", "Cb_exec_time");
fprintf(stream, "%-20s %-10s %-12s %-12s %-12s %-12s %-12s\n",
"Name", "Period", "Alarm", "Times_armed", "Times_trigg", "Times_skip", "Cb_exec_time");
#else
fprintf(stream, "%-20s %-10s %-12s\n", "Name", "Period", "Alarm");
fprintf(stream, "%-20s %-10s %-12s\n", "Name", "Period", "Alarm");
#endif
/* Print the buffer */
if (stream != NULL) {
/* Print the buffer */
fputs(print_buf, stream);
}