Skip to content

Commit 2262eab

Browse files
committed
Remove Streaming dependency
1 parent 8ecf85c commit 2262eab

File tree

4 files changed

+57
-32
lines changed

4 files changed

+57
-32
lines changed

examples/Test_6_delays/Test_6_delays.ino

Lines changed: 21 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,35 +6,44 @@ void setup() { Serial.begin(9600); }
66

77
void loop() {
88
static VirtualDelay delay1, delay2, delay3, delay4, delay5, delay6;
9-
DO_ONCE(Serial << "\nDO_ONCE 1";
9+
DO_ONCE(Serial.println("\nDO_ONCE 1");
1010
delay1.start(200); // start sequence delay1 delay2 delay3
1111
delay4.start(550); // start one-shot delay4
1212
delay5.start(1250); // start one-shot delay5
1313
)
14-
if (delay4.elapsed())
15-
Serial << "\nONE-SHOT 550ms " << millis();
16-
if (delay5.elapsed())
17-
Serial << "\nONE-SHOT 1250ms " << millis();
14+
if (delay4.elapsed()) {
15+
Serial.print("\nONE-SHOT 550ms ");
16+
Serial.println(millis());
17+
}
18+
if (delay5.elapsed()) {
19+
Serial.print("\nONE-SHOT 1250ms ");
20+
Serial.println(millis());
21+
}
1822

1923
if (millis() > 2250)
20-
DO_ONCE(Serial << "\nDO_ONCE 2 2250ms "
21-
<< millis()) // test a second DO_ONCE
24+
DO_ONCE(Serial.print("\nDO_ONCE 2 2250ms ");
25+
Serial.println(millis())) // test a second DO_ONCE
2226

2327
delay6.start(750);
24-
if (delay6.elapsed())
25-
Serial << "\n Repeat delay6 750ms " << millis();
28+
if (delay6.elapsed()) {
29+
Serial.print("\n Repeat delay6 750ms ");
30+
Serial.println(millis());
31+
}
2632

2733
if (delay1.elapsed()) // sequence with deadlock
2834
{
29-
Serial << "\nsequence delay1 200ms " << millis();
35+
Serial.print("\nsequence delay1 200ms ");
36+
Serial.println(millis());
3037
delay2.start(100);
3138
}
3239
if (delay2.elapsed()) {
33-
Serial << "\nsequence delay2 100ms " << millis();
40+
Serial.print("\nsequence delay2 100ms ");
41+
Serial.println(millis());
3442
delay3.start(400);
3543
}
3644
if (delay3.elapsed()) {
37-
Serial << "\nsequence delay3 400ms " << millis();
45+
Serial.print("\nsequence delay3 400ms ");
46+
Serial.println(millis());
3847
delay1.start(200);
3948
}
4049
}

examples/Test_rollover/Test_rollover.ino

Lines changed: 24 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
#include "avdweb_VirtualDelay.h"
2-
#include <Albert.h>
32
#include <Arduino.h>
4-
#include <Streaming.h>
53
#include <util/atomic.h>
64

75
VirtualDelay delay_ms;
@@ -24,16 +22,31 @@ void setup() {
2422

2523
t0_ms = millis();
2624
t0_us = micros();
27-
Serial << "\nTest VirtualDelay ms " << ms << "ms";
28-
Serial << "\nTest VirtualDelay us " << us << "us";
29-
Serial << "\nChanged t0_ms=" << t0_ms << "ms";
25+
Serial.print("\nTest VirtualDelay ms ");
26+
Serial.print(ms);
27+
Serila.println("ms");
28+
29+
Serial.print("\nTest VirtualDelay us ");
30+
Serial.print(us);
31+
Serial.println("us");
32+
33+
Serial.print("\nChanged t0_ms=");
34+
Serial.print(t0_ms);
35+
Serial.println("ms");
3036
}
3137

3238
void loop() {
33-
DO_ONCE // do only one time in the loop
34-
(delay_ms.start(ms); delay_us.start(us);) if (delay_ms.elapsed()) Serial
35-
<< "\n"
36-
<< millis() - t0_ms << "ms"; // result is ~ 1021ms
37-
if (delay_us.elapsed())
38-
Serial << "\n" << micros() - t0_us << "us"; // result is ~ 2021884us
39+
// do only one time in the loop
40+
DO_ONCE(delay_ms.start(ms); delay_us.start(us);)
41+
42+
if (delay_ms.elapsed()) {
43+
Serial.println();
44+
Serial.print(millis() - t0_ms);
45+
Serial.println("ms"); // result is ~ 1021ms
46+
}
47+
if (delay_us.elapsed()) {
48+
Serial.println();
49+
Serial.print(micros() - t0_us);
50+
Serial.println("us"); // result is ~ 2021884us
51+
}
3952
}
Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
#include "avdweb_VirtualDelay.h"
22
#include <Arduino.h>
3-
#include <Streaming.h>
43

54
VirtualDelay delay1;
65

76
void setup() {
87
Serial.begin(9600);
9-
Serial << "\ntestOneShot 2s\n";
8+
Serial.println("\ntestOneShot 2s");
109
}
1110

1211
void loop() {
1312
DO_ONCE(delay1.start(2000)) // do only one time in the loop
14-
if (delay1.elapsed())
15-
Serial << millis() << "ms";
13+
if (delay1.elapsed()) {
14+
Serial.print(millis());
15+
Serial.println("ms");
16+
}
1617
}

examples/testSequence/testSequence.ino

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,28 @@
11
#include "avdweb_VirtualDelay.h"
22
#include <Arduino.h>
3-
#include <Streaming.h>
43

54
VirtualDelay delay1, delay2, delay3;
65

76
void setup() {
87
Serial.begin(9600);
9-
Serial << "\ntestSequence";
8+
Serial.println("\ntestSequence");
109
}
1110

1211
void loop() {
1312
if (delay1.elapsed()) // this sequence has a deadlock
1413
{
15-
Serial << "\ndelay1 200ms " << millis();
14+
Serial.print("\ndelay1 200ms ");
15+
Serial.println(millis());
1616
delay2.start(100);
1717
}
1818
if (delay2.elapsed()) {
19-
Serial << "\ndelay2 100ms " << millis();
19+
Serial.print("\ndelay2 100ms ");
20+
Serial.println(millis());
2021
delay3.start(400);
2122
}
2223
if (delay3.elapsed()) {
23-
Serial << "\ndelay3 400ms " << millis();
24+
Serial.print("\ndelay3 400ms ");
25+
Serial.println(millis());
2426
delay1.start(200);
2527
}
2628
DO_ONCE(delay1.start(200)); // breaks the deadlock, you can start with any

0 commit comments

Comments
 (0)