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

dok-net · dok-net · commit 70936595810a · 2019-06-06T15:31:16.000+02:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -191,6 +191,7 @@ set(COMPONENT_ADD_INCLUDEDIRS
   libraries/HTTPClient/src
   libraries/HTTPUpdate/src
   libraries/NetBIOS/src
+  libraries/PolledTimeout/src
   libraries/Preferences/src
   libraries/Schedule/src
   libraries/SD_MMC/src
diff --git a/cores/esp32/esp32-hal-misc.c b/cores/esp32/esp32-hal-misc.c
@@ -160,7 +160,7 @@ void yield()
 
 void delay(uint32_t ms)
 {
-    vTaskDelay(ms / portTICK_PERIOD_MS);
+	vTaskDelay(ms / portTICK_PERIOD_MS);
 	yield_completed();
 }
 
diff --git a/libraries/PolledTimeout/library.properties b/libraries/PolledTimeout/library.properties
@@ -0,0 +1,9 @@
+name=PolledTimeout
+version=1.0
+author=
+maintainer=
+sentence=
+paragraph=
+category=Other
+url=
+architectures=esp32
diff --git a/libraries/PolledTimeout/src/PolledTimeout.h b/libraries/PolledTimeout/src/PolledTimeout.h
diff --git a/libraries/Schedule/src/Schedule.cpp b/libraries/Schedule/src/Schedule.cpp
@@ -1,9 +1,9 @@
 #include "Schedule.h"
-#include "PolledTimeout/PolledTimeout.h"
-#include "Ticker.h"
+#include <PolledTimeout.h>
+#include <Ticker.h>
 #ifdef ESP8266
-#include "interrupts.h"
-#include "coredecls.h"
+#include <interrupts.h>
+#include <coredecls.h>
 #else
 #include <mutex>
 #endif

Original file line number	Diff line number	Diff line change
`@@ -160,7 +160,7 @@ void yield()`
`160`	`160`
`161`	`161`	`void delay(uint32_t ms)`
`162`	`162`	`{`
`163`		`- vTaskDelay(ms / portTICK_PERIOD_MS);`
	`163`	`+ vTaskDelay(ms / portTICK_PERIOD_MS);`
`164`	`164`	`yield_completed();`
`165`	`165`	`}`
`166`	`166`