Skip to content

Commit 7093659

Browse files
committed
Merge branch 'add-schedule' into functional-shouldbe-lib
2 parents 0d705b4 + eb3ae46 commit 7093659

File tree

5 files changed

+15
-5
lines changed

5 files changed

+15
-5
lines changed

CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,7 @@ set(COMPONENT_ADD_INCLUDEDIRS
191191
libraries/HTTPClient/src
192192
libraries/HTTPUpdate/src
193193
libraries/NetBIOS/src
194+
libraries/PolledTimeout/src
194195
libraries/Preferences/src
195196
libraries/Schedule/src
196197
libraries/SD_MMC/src

cores/esp32/esp32-hal-misc.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ void yield()
160160

161161
void delay(uint32_t ms)
162162
{
163-
vTaskDelay(ms / portTICK_PERIOD_MS);
163+
vTaskDelay(ms / portTICK_PERIOD_MS);
164164
yield_completed();
165165
}
166166

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
name=PolledTimeout
2+
version=1.0
3+
author=
4+
maintainer=
5+
sentence=
6+
paragraph=
7+
category=Other
8+
url=
9+
architectures=esp32

libraries/Schedule/src/Schedule.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#include "Schedule.h"
2-
#include "PolledTimeout/PolledTimeout.h"
3-
#include "Ticker.h"
2+
#include <PolledTimeout.h>
3+
#include <Ticker.h>
44
#ifdef ESP8266
5-
#include "interrupts.h"
6-
#include "coredecls.h"
5+
#include <interrupts.h>
6+
#include <coredecls.h>
77
#else
88
#include <mutex>
99
#endif

0 commit comments

Comments
 (0)