Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cores/esp32/esp32-hal-timer.c
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ uint64_t timerReadMicros(hw_timer_t *timer) {
return timer_val * 1000000 / frequency;
}

uint64_t timerReadMilis(hw_timer_t *timer) {
uint64_t timerReadMillis(hw_timer_t *timer) {
if (timer == NULL) {
log_e("Timer handle is NULL");
return 0;
Expand Down
2 changes: 1 addition & 1 deletion cores/esp32/esp32-hal-timer.h
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ void timerWrite(hw_timer_t *timer, uint64_t val);

uint64_t timerRead(hw_timer_t *timer);
uint64_t timerReadMicros(hw_timer_t *timer);
uint64_t timerReadMilis(hw_timer_t *timer);
uint64_t timerReadMillis(hw_timer_t *timer);
double timerReadSeconds(hw_timer_t *timer);

uint32_t timerGetFrequency(hw_timer_t *timer);
Expand Down
6 changes: 3 additions & 3 deletions docs/en/api/timer.rst
Original file line number Diff line number Diff line change
Expand Up @@ -119,14 +119,14 @@ This function is used to read counter value in microseconds of the timer.

This function will return ``counter value`` of the timer in microseconds.

timerReadMilis
**************
timerReadMillis
***************

This function is used to read counter value in milliseconds of the timer.

.. code-block:: arduino

uint64_t timerReadMilis(hw_timer_t * timer);
uint64_t timerReadMillis(hw_timer_t * timer);

* ``timer`` timer struct.

Expand Down
Loading