Fix millis/micros mismatch.

Author: dok-net

cores/esp8266/Schedule.cpp

@@ -120,10 +120,10 @@ bool schedule_recurrent_function_us(const std::function<bool(void)>& fn,
     item->alarm = alarm;
 
     // prevent new item overwriting an already expired rTarget.
-    const int32_t rRemaining = rTarget - millis();
+    const int32_t rRemaining = rTarget - micros();
     if (!rFirst || (rRemaining > 0 && static_cast<uint32_t>(rRemaining) > item->callNow.remaining()))
     {
-        rTarget = millis() + item->callNow.remaining();
+        rTarget = micros() + item->callNow.remaining();
     }
 
     esp8266::InterruptLock lockAllInterruptsInThisScope;
@@ -141,11 +141,11 @@ bool schedule_recurrent_function_us(const std::function<bool(void)>& fn,
     return true;
 }
 
-uint32_t get_scheduled_recurrent_delay()
+uint32_t get_scheduled_recurrent_delay_us()
 {
     if (!rFirst) return ~static_cast<uint32_t>(0);
     // handle already expired rTarget.
-    const int32_t rRemaining = rTarget - millis();
+    const int32_t rRemaining = rTarget - micros();
     return (rRemaining > 0) ? static_cast<uint32_t>(rRemaining) : 0;
 }
 
@@ -209,7 +209,7 @@ void run_scheduled_recurrent_functions()
         fence = true;
     }
 
-    rTarget = millis() + current->callNow.remaining();
+    rTarget = micros() + current->callNow.remaining();
     recurrent_fn_t* prev = nullptr;
     // prevent scheduling of new functions during this run
     auto stop = rLast;
@@ -249,10 +249,10 @@ void run_scheduled_recurrent_functions()
             prev = current;
             current = current->mNext;
             // prevent current item overwriting an already expired rTarget.
-            const int32_t rRemaining = rTarget - millis();
+            const int32_t rRemaining = rTarget - micros();
             if (rRemaining > 0 && static_cast<uint32_t>(rRemaining) > current->callNow.remaining())
             {
-                rTarget = millis() + current->callNow.remaining();
+                rTarget = micros() + current->callNow.remaining();
             }
         }
 

cores/esp8266/Schedule.h

@@ -39,10 +39,10 @@
 // scheduled function happen more often: every yield() (vs every loop()),
 // and time resolution is microsecond (vs millisecond). Details are below.
 
-// get_scheduled_recurrent_delay() is used by delay() to give a chance to
+// get_scheduled_recurrent_delay_us() is used by delay() to give a chance to
 // all recurrent functions to run per their timing requirement.
 
-uint32_t get_scheduled_recurrent_delay();
+uint32_t get_scheduled_recurrent_delay_us();
 
 // scheduled functions called once:
 //

cores/esp8266/core_esp8266_main.cpp

@@ -173,7 +173,7 @@ bool esp_try_delay(const uint32_t start_ms, const uint32_t timeout_ms, const uin
     }
 
     // compute greatest delay interval with respect to scheduled recurrent functions
-    const uint32_t max_delay_ms = std::min(intvl_ms, get_scheduled_recurrent_delay());
+    const uint32_t max_delay_ms = std::min(intvl_ms, get_scheduled_recurrent_delay_us() / 1000);
 
     // recurrent scheduled functions will be called from esp_delay()->esp_suspend()
     esp_delay(std::min((timeout_ms - expired), max_delay_ms));