Skip to content

Commit 62af940

Browse files
committed
By review feedback, maintain esp_ as prefix.
1 parent 67ced12 commit 62af940

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

cores/esp8266/core_esp8266_main.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ extern "C" void __esp_delay(unsigned long ms) {
162162

163163
extern "C" void esp_delay(unsigned long ms) __attribute__((weak, alias("__esp_delay")));
164164

165-
bool try_esp_delay(const uint32_t start_ms, const uint32_t timeout_ms, const uint32_t intvl_ms) {
165+
bool esp_try_delay(const uint32_t start_ms, const uint32_t timeout_ms, const uint32_t intvl_ms) {
166166
uint32_t expired = millis() - start_ms;
167167
if (expired >= timeout_ms) {
168168
return true;

cores/esp8266/coredecls.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ inline void esp_suspend(T&& blocked) {
5555
// is asynchronously resumed before the timeout is reached.
5656
// Also returns false if intvl_ms have expired during the active call.
5757
// Otherwise return true to indicate the timeout_ms have completely expired.
58-
bool try_esp_delay(const uint32_t start_ms, const uint32_t timeout_ms, const uint32_t intvl_ms);
58+
bool esp_try_delay(const uint32_t start_ms, const uint32_t timeout_ms, const uint32_t intvl_ms);
5959

6060
// This overload of esp_delay() delays for a duration of at most timeout_ms milliseconds.
6161
// Whenever it is resumed, as well as every intvl_ms millisconds, it performs
@@ -64,7 +64,7 @@ bool try_esp_delay(const uint32_t start_ms, const uint32_t timeout_ms, const uin
6464
template <typename T>
6565
inline void esp_delay(const uint32_t timeout_ms, T&& blocked, const uint32_t intvl_ms) {
6666
const auto start_ms = millis();
67-
while (!try_esp_delay(start_ms, timeout_ms, intvl_ms) && blocked()) {
67+
while (!esp_try_delay(start_ms, timeout_ms, intvl_ms) && blocked()) {
6868
}
6969
}
7070

tests/host/common/Arduino.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ extern "C" void esp_delay (unsigned long ms)
7171
usleep(ms * 1000);
7272
}
7373

74-
bool try_esp_delay(const uint32_t start_ms, const uint32_t timeout_ms, const uint32_t intvl_ms) {
74+
bool esp_try_delay(const uint32_t start_ms, const uint32_t timeout_ms, const uint32_t intvl_ms) {
7575
decltype(millis()) expired;
7676

7777
if ((expired = millis() - start_ms) >= timeout_ms) {

0 commit comments

Comments
 (0)