Skip to content

fix(misc): Improve micros() int size #9803

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

fix(misc): Improve micros() int size #9803

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1b15db2
fix(misc): Use 64 bit return value for micros()
leandromattioli Jun 7, 2024
3d25457
feat(hal): delayMicroseconds(uint64_t)
SuGlider Jun 9, 2024
5ebb3a4
feat(hal): Add 64 bits parameter
SuGlider Jun 9, 2024
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
6 changes: 3 additions & 3 deletions cores/esp32/esp32-hal-misc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,8 +191,8 @@ BaseType_t xTaskCreateUniversal(
#endif
}

unsigned long ARDUINO_ISR_ATTR micros() {
return (unsigned long)(esp_timer_get_time());
unsigned long long ARDUINO_ISR_ATTR micros() {
return (unsigned long long)(esp_timer_get_time());
}

unsigned long ARDUINO_ISR_ATTR millis() {
Expand All @@ -203,7 +203,7 @@ void delay(uint32_t ms) {
vTaskDelay(ms / portTICK_PERIOD_MS);
}

void ARDUINO_ISR_ATTR delayMicroseconds(uint32_t us) {
void ARDUINO_ISR_ATTR delayMicroseconds(uint64_t us) {
uint64_t m = (uint64_t)esp_timer_get_time();
if (us) {
uint64_t e = (m + us);
Expand Down
4 changes: 2 additions & 2 deletions cores/esp32/esp32-hal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,10 +121,10 @@ BaseType_t xTaskCreateUniversal(
TaskHandle_t *const pxCreatedTask, const BaseType_t xCoreID
);

unsigned long micros();
unsigned long long micros();
unsigned long millis();
void delay(uint32_t);
void delayMicroseconds(uint32_t us);
void delayMicroseconds(uint64_t us);

#if !CONFIG_ESP32_PHY_AUTO_INIT
void arduino_phy_init();
Expand Down