Skip to content

Commit 1aea8f3

Browse files
committed
Scheduler: rename sleep in wait; fixed example
1 parent c21da3b commit 1aea8f3

File tree

3 files changed

+18
-14
lines changed

3 files changed

+18
-14
lines changed

hardware/arduino/sam/libraries/Scheduler/Scheduler.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ void yield(void) {
122122
coopDoYield(cur);
123123
}
124124

125-
void sleep(uint32_t ms) {
125+
void wait(uint32_t ms) {
126126
uint32_t start = millis();
127127
while (millis() - start < ms)
128128
yield();

hardware/arduino/sam/libraries/Scheduler/Scheduler.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ extern "C" {
2323
typedef void (*SchedulerTask)(void);
2424
typedef void (*SchedulerParametricTask)(void *);
2525

26-
void sleep(uint32_t ms);
26+
void wait(uint32_t ms);
2727
void yield();
2828
}
2929

@@ -34,7 +34,7 @@ class SchedulerClass {
3434
static void start(SchedulerTask task, uint32_t stackSize = 1024);
3535
static void start(SchedulerParametricTask task, void *data, uint32_t stackSize = 1024);
3636

37-
static void sleep(uint32_t ms) { ::sleep(ms); };
37+
static void wait(uint32_t ms) { ::wait(ms); };
3838
static void yield() { ::yield(); };
3939
};
4040

hardware/arduino/sam/libraries/Scheduler/examples/MultipleBlinks/MultipleBlinks.ino

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ int led2 = 12;
77
int led3 = 11;
88

99
void setup() {
10-
Serial1.begin(115200);
10+
Serial.begin(115200);
1111

1212
// Setup the 3 pins as OUTPUT
1313
pinMode(led1, OUTPUT);
@@ -25,33 +25,37 @@ void loop() {
2525
digitalWrite(led1, HIGH);
2626

2727
// IMPORTANT:
28-
// We must use 'sleep' instead of 'delay' to guarantee
28+
// We must use 'wait' instead of 'delay' to guarantee
2929
// that the other tasks get executed.
30-
// (sleep passes control to other tasks while waiting)
31-
sleep(1000);
30+
// ('wait' passes control to other tasks while waiting)
31+
wait(1000);
3232

3333
digitalWrite(led1, LOW);
34-
sleep(1000);
34+
wait(1000);
3535
}
3636

3737
// Task no.2: blink LED with 0.1 second delay.
3838
void loop2() {
3939
digitalWrite(led2, HIGH);
40-
sleep(100);
40+
wait(100);
4141
digitalWrite(led2, LOW);
42-
sleep(100);
42+
wait(100);
4343
}
4444

4545
// Task no.3: accept commands from Serial1 port
4646
// '0' turns off LED
4747
// '1' turns on LED
4848
void loop3() {
49-
if (Serial1.available()) {
50-
char c = Serial1.read();
51-
if (c=='0')
49+
if (Serial.available()) {
50+
char c = Serial.read();
51+
if (c=='0') {
5252
digitalWrite(led3, LOW);
53-
if (c=='1')
53+
Serial.println("Led turned off!");
54+
}
55+
if (c=='1') {
5456
digitalWrite(led3, HIGH);
57+
Serial.println("Led turned on!");
58+
}
5559
}
5660

5761
// IMPORTANT:

0 commit comments

Comments
 (0)