Merge branch 'add-schedule' into functional-shouldbe-lib

Author: dok-net

CMakeLists.txt

@@ -28,10 +28,8 @@ set(CORE_SRCS
   cores/esp32/MD5Builder.cpp
   cores/esp32/Print.cpp
   cores/esp32/stdlib_noniso.c
-  cores/esp32/Schedule.cpp
   cores/esp32/Stream.cpp
   cores/esp32/StreamString.cpp
-  cores/esp32/Ticker.cpp
   cores/esp32/wiring_pulse.c
   cores/esp32/wiring_shift.c
   cores/esp32/WMath.cpp
@@ -53,6 +51,7 @@ set(LIBRARY_SRCS
   libraries/HTTPUpdate/src/HTTPUpdate.cpp
   libraries/NetBIOS/src/NetBIOS.cpp
   libraries/Preferences/src/Preferences.cpp
+  libraries/Schedule/src/Schedule.cpp
   libraries/SD_MMC/src/SD_MMC.cpp
   libraries/SD/src/SD.cpp
   libraries/SD/src/sd_diskio.cpp
@@ -193,6 +192,7 @@ set(COMPONENT_ADD_INCLUDEDIRS
   libraries/HTTPUpdate/src
   libraries/NetBIOS/src
   libraries/Preferences/src
+  libraries/Schedule/src
   libraries/SD_MMC/src
   libraries/SD/src
   libraries/SimpleBLE/src

cores/esp32/Arduino.h

@@ -130,6 +130,9 @@ void init(void);
 void initVariant(void);
 void initArduino(void);
 
+void yield_completed(void);
+void loop_completed(void);
+
 unsigned long pulseIn(uint8_t pin, uint8_t state, unsigned long timeout);
 unsigned long pulseInLong(uint8_t pin, uint8_t state, unsigned long timeout);
 
@@ -153,7 +156,6 @@ void shiftOut(uint8_t dataPin, uint8_t clockPin, uint8_t bitOrder, uint8_t val);
 #include "Udp.h"
 #include "HardwareSerial.h"
 #include "Esp.h"
-#include "Schedule.h"
 
 using std::abs;
 using std::isinf;

cores/esp32/Ticker.cpp

@@ -34,7 +34,6 @@
 #include "rom/rtc.h"
 #include "esp_task_wdt.h"
 #include "esp32-hal.h"
-#include "Schedule.h"
 
 //Undocumented!!! Get chip temperature in Farenheit
 //Source: https://github.com/pcbreflux/espressif/blob/master/esp32/arduino/sketchbook/ESP32_int_temp_sensor/ESP32_int_temp_sensor.ino
@@ -45,12 +44,6 @@ float temperatureRead()
     return (temprature_sens_read() - 32) / 1.8;
 }
 
-void yield()
-{
-    vPortYield();
-    run_scheduled_functions(SCHEDULE_FUNCTION_WITHOUT_YIELDELAYCALLS);
-}
-
 #if CONFIG_AUTOSTART_ARDUINO
 
 extern TaskHandle_t loopTaskHandle;
@@ -141,9 +134,34 @@ unsigned long IRAM_ATTR millis()
     return (unsigned long) (esp_timer_get_time() / 1000ULL);
 }
 
+void initVariant() __attribute__((weak));
+void initVariant() {}
+
+void init() __attribute__((weak));
+void init() {}
+
+void yield_completed() __attribute__((weak));
+void yield_completed() {}
+
+bool verifyOta() __attribute__((weak));
+bool verifyOta() { return true; }
+
+#ifdef CONFIG_BT_ENABLED
+//overwritten in esp32-hal-bt.c
+bool btInUse() __attribute__((weak));
+bool btInUse() { return false; }
+#endif
+
+void yield()
+{
+	vPortYield();
+	yield_completed();
+}
+
 void delay(uint32_t ms)
 {
     vTaskDelay(ms / portTICK_PERIOD_MS);
+	yield_completed();
 }
 
 void IRAM_ATTR delayMicroseconds(uint32_t us)
@@ -162,21 +180,6 @@ void IRAM_ATTR delayMicroseconds(uint32_t us)
     }
 }
 
-void initVariant() __attribute__((weak));
-void initVariant() {}
-
-void init() __attribute__((weak));
-void init() {}
-
-bool verifyOta() __attribute__((weak));
-bool verifyOta() { return true; }
-
-#ifdef CONFIG_BT_ENABLED
-//overwritten in esp32-hal-bt.c
-bool btInUse() __attribute__((weak));
-bool btInUse(){ return false; }
-#endif
-
 void initArduino()
 {
 #ifdef CONFIG_APP_ROLLBACK_ENABLE

cores/esp32/Ticker.h

@@ -17,7 +17,7 @@ void loopTask(void *pvParameters)
             esp_task_wdt_reset();
         }
         loop();
-        run_scheduled_functions(SCHEDULE_FUNCTION_FROM_LOOP);
+        loop_completed();
     }
 }
 
@@ -28,4 +28,7 @@ extern "C" void app_main()
     xTaskCreateUniversal(loopTask, "loopTask", 8192, NULL, 1, &loopTaskHandle, CONFIG_ARDUINO_RUNNING_CORE);
 }
 
+extern "C" void loop_completed() __attribute__((weak));
+extern "C" void loop_completed() {}
+
 #endif