Skip to content

Commit c8994dd

Browse files
Brian FletcherBrian Fletcher
Brian Fletcher
authored and
Brian Fletcher
committed
Replace all tabs with whitespaces
1 parent 7dbb539 commit c8994dd

11 files changed

+226
-226
lines changed

‎Command.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,17 @@
88
#include "Command.h"
99

1010
Command::Command() {
11-
instruction = "default";
11+
instruction = "default";
1212
}
1313

1414
Command::~Command() {
1515
}
1616

1717
String Command::getInstruction(){
18-
return instruction;
18+
return instruction;
1919
}
2020

2121
void Command::execute(String parameter){
22-
Serial.println("test");
22+
Serial.println("test");
2323
};
2424

‎Command.h

+5-5
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@
1111

1212
class Command {
1313
public:
14-
Command();
15-
virtual ~Command();
16-
virtual void execute (String parameter) = 0;
17-
String getInstruction();
14+
Command();
15+
virtual ~Command();
16+
virtual void execute (String parameter) = 0;
17+
String getInstruction();
1818
protected:
19-
String instruction;
19+
String instruction;
2020
};
2121

2222
#endif /* COMMAND_H_ */

‎Cron.cpp

+146-146
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
RTC_DS1307 RTC;
1111

1212
Cron::Cron(TimedCommand **iTimedCommands, int iTimedCommandsSize) {
13-
timedCommands = iTimedCommands;
14-
timedCommandsSize = iTimedCommandsSize;
13+
timedCommands = iTimedCommands;
14+
timedCommandsSize = iTimedCommandsSize;
1515

16-
Wire.begin();
16+
Wire.begin();
1717
RTC.begin();
1818
}
1919

@@ -23,159 +23,159 @@ Cron::~Cron() {
2323

2424

2525
void Cron::loop(){
26-
bool match = false;
27-
for (int i = 0; i< timedCommandsSize; i++){
28-
if (matchCron(timedCommands[i]->getCronString(),getTime())){
29-
Command *command = timedCommands[i]->getCommand();
30-
command->execute(timedCommands[i]->getParameters());
31-
match = true;
32-
}
33-
}
34-
if (match){
35-
delay(1000);
36-
}
26+
bool match = false;
27+
for (int i = 0; i< timedCommandsSize; i++){
28+
if (matchCron(timedCommands[i]->getCronString(),getTime())){
29+
Command *command = timedCommands[i]->getCommand();
30+
command->execute(timedCommands[i]->getParameters());
31+
match = true;
32+
}
33+
}
34+
if (match){
35+
delay(1000);
36+
}
3737
}
3838

3939
DateTime Cron::getTime(){
40-
DateTime now = RTC.now();
41-
return now;
40+
DateTime now = RTC.now();
41+
return now;
4242
}
4343

4444
boolean Cron::matchCron(String cronString, DateTime time){
45-
boolean secMatch,minMatch,hourMatch,dayMatch,monMatch,yearMatch;
46-
String tempTimeString;
47-
String commandString;
48-
int cronTime[6];
49-
cronString.trim();
50-
tempTimeString = cronString.substring(0,cronString.indexOf('.'));
51-
if (tempTimeString.equals("*")) {
52-
cronTime[0] = -1;
53-
} else {
54-
cronTime[0] = tempTimeString.toInt();
55-
}
56-
cronString.trim();
57-
cronString = cronString.substring(cronString.indexOf('.') + 1);
58-
tempTimeString = cronString.substring(0,cronString.indexOf('.'));
59-
if (tempTimeString.equals("*")) {
60-
cronTime[1] = -1;
61-
} else {
62-
cronTime[1] = tempTimeString.toInt();
63-
}
64-
cronString = cronString.substring(cronString.indexOf('.') + 1);
65-
tempTimeString = cronString.substring(0,cronString.indexOf('.'));
66-
if (tempTimeString.equals("*")) {
67-
cronTime[2] = -1;
68-
} else {
69-
cronTime[2] = tempTimeString.toInt();
70-
}
71-
cronString = cronString.substring(cronString.indexOf('.') + 1);
72-
tempTimeString = cronString.substring(0,cronString.indexOf('.'));
73-
if (tempTimeString.equals("*")) {
74-
cronTime[3] = -1;
75-
} else {
76-
cronTime[3] = tempTimeString.toInt();
77-
}
78-
cronString = cronString.substring(cronString.indexOf('.') + 1);
79-
tempTimeString = cronString.substring(0,cronString.indexOf('.'));
80-
if (tempTimeString.equals("*")) {
81-
cronTime[4] = -1;
82-
} else {
83-
cronTime[4] = tempTimeString.toInt();
84-
}
85-
cronString = cronString.substring(cronString.indexOf('.') + 1);
86-
tempTimeString = cronString.substring(0,cronString.indexOf('.'));
87-
if (tempTimeString.equals("*")) {
88-
cronTime[5] = -1;
89-
} else {
90-
cronTime[5] = tempTimeString.toInt();
91-
}
92-
cronString = cronString.substring(cronString.indexOf('.') + 1);
93-
commandString = cronString.substring(0,cronString.indexOf('.'));
94-
95-
cronString = "";
96-
97-
if (cronTime[5] == -1){
98-
yearMatch = true;
99-
} else
100-
101-
if (time.year() == cronTime[5]){
102-
yearMatch = true;
103-
} else{
104-
yearMatch = false;
105-
}
106-
107-
if (cronTime[4] == -1){
108-
monMatch = true;
109-
} else
110-
111-
if (time.month() == cronTime[4]){
112-
monMatch = true;
113-
} else{
114-
monMatch = false;
115-
}
116-
117-
if (cronTime[3] == -1){
118-
dayMatch = true;
119-
} else
120-
121-
if (time.day() == cronTime[3]){
122-
dayMatch = true;
123-
} else{
124-
dayMatch = false;
125-
}
126-
127-
if (cronTime[2] == -1){
128-
hourMatch = true;
129-
} else
130-
131-
if (time.hour() == cronTime[2]){
132-
hourMatch = true;
133-
} else{
134-
hourMatch = false;
135-
}
136-
137-
if (cronTime[1] == -1){
138-
minMatch = true;
139-
} else
140-
141-
if (time.minute() == cronTime[1]){
142-
minMatch = true;
143-
} else{
144-
minMatch = false;
145-
}
146-
147-
if (cronTime[0] == -1){
148-
secMatch = true;
149-
} else
150-
151-
if (time.second() == cronTime[0]){
152-
secMatch = true;
153-
} else{
154-
secMatch = false;
155-
}
156-
if (secMatch && minMatch && hourMatch && dayMatch && monMatch && yearMatch){
157-
return true;
158-
} else {
159-
return false;
160-
}
45+
boolean secMatch,minMatch,hourMatch,dayMatch,monMatch,yearMatch;
46+
String tempTimeString;
47+
String commandString;
48+
int cronTime[6];
49+
cronString.trim();
50+
tempTimeString = cronString.substring(0,cronString.indexOf('.'));
51+
if (tempTimeString.equals("*")) {
52+
cronTime[0] = -1;
53+
} else {
54+
cronTime[0] = tempTimeString.toInt();
55+
}
56+
cronString.trim();
57+
cronString = cronString.substring(cronString.indexOf('.') + 1);
58+
tempTimeString = cronString.substring(0,cronString.indexOf('.'));
59+
if (tempTimeString.equals("*")) {
60+
cronTime[1] = -1;
61+
} else {
62+
cronTime[1] = tempTimeString.toInt();
63+
}
64+
cronString = cronString.substring(cronString.indexOf('.') + 1);
65+
tempTimeString = cronString.substring(0,cronString.indexOf('.'));
66+
if (tempTimeString.equals("*")) {
67+
cronTime[2] = -1;
68+
} else {
69+
cronTime[2] = tempTimeString.toInt();
70+
}
71+
cronString = cronString.substring(cronString.indexOf('.') + 1);
72+
tempTimeString = cronString.substring(0,cronString.indexOf('.'));
73+
if (tempTimeString.equals("*")) {
74+
cronTime[3] = -1;
75+
} else {
76+
cronTime[3] = tempTimeString.toInt();
77+
}
78+
cronString = cronString.substring(cronString.indexOf('.') + 1);
79+
tempTimeString = cronString.substring(0,cronString.indexOf('.'));
80+
if (tempTimeString.equals("*")) {
81+
cronTime[4] = -1;
82+
} else {
83+
cronTime[4] = tempTimeString.toInt();
84+
}
85+
cronString = cronString.substring(cronString.indexOf('.') + 1);
86+
tempTimeString = cronString.substring(0,cronString.indexOf('.'));
87+
if (tempTimeString.equals("*")) {
88+
cronTime[5] = -1;
89+
} else {
90+
cronTime[5] = tempTimeString.toInt();
91+
}
92+
cronString = cronString.substring(cronString.indexOf('.') + 1);
93+
commandString = cronString.substring(0,cronString.indexOf('.'));
94+
95+
cronString = "";
96+
97+
if (cronTime[5] == -1){
98+
yearMatch = true;
99+
} else
100+
101+
if (time.year() == cronTime[5]){
102+
yearMatch = true;
103+
} else{
104+
yearMatch = false;
105+
}
106+
107+
if (cronTime[4] == -1){
108+
monMatch = true;
109+
} else
110+
111+
if (time.month() == cronTime[4]){
112+
monMatch = true;
113+
} else{
114+
monMatch = false;
115+
}
116+
117+
if (cronTime[3] == -1){
118+
dayMatch = true;
119+
} else
120+
121+
if (time.day() == cronTime[3]){
122+
dayMatch = true;
123+
} else{
124+
dayMatch = false;
125+
}
126+
127+
if (cronTime[2] == -1){
128+
hourMatch = true;
129+
} else
130+
131+
if (time.hour() == cronTime[2]){
132+
hourMatch = true;
133+
} else{
134+
hourMatch = false;
135+
}
136+
137+
if (cronTime[1] == -1){
138+
minMatch = true;
139+
} else
140+
141+
if (time.minute() == cronTime[1]){
142+
minMatch = true;
143+
} else{
144+
minMatch = false;
145+
}
146+
147+
if (cronTime[0] == -1){
148+
secMatch = true;
149+
} else
150+
151+
if (time.second() == cronTime[0]){
152+
secMatch = true;
153+
} else{
154+
secMatch = false;
155+
}
156+
if (secMatch && minMatch && hourMatch && dayMatch && monMatch && yearMatch){
157+
return true;
158+
} else {
159+
return false;
160+
}
161161
}
162162

163163
void Cron::printTime(){
164-
DateTime time = getTime();
165-
Serial.print(time.year(), DEC);
166-
Serial.print('/');
167-
Serial.print(time.month(), DEC);
168-
Serial.print('/');
169-
Serial.print(time.day(), DEC);
170-
Serial.print(' ');
171-
Serial.print(time.hour(), DEC);
172-
Serial.print(':');
173-
Serial.print(time.minute(), DEC);
174-
Serial.print(':');
175-
Serial.print(time.second(), DEC);
176-
Serial.println();
164+
DateTime time = getTime();
165+
Serial.print(time.year(), DEC);
166+
Serial.print('/');
167+
Serial.print(time.month(), DEC);
168+
Serial.print('/');
169+
Serial.print(time.day(), DEC);
170+
Serial.print(' ');
171+
Serial.print(time.hour(), DEC);
172+
Serial.print(':');
173+
Serial.print(time.minute(), DEC);
174+
Serial.print(':');
175+
Serial.print(time.second(), DEC);
176+
Serial.println();
177177
}
178178

179179
void Cron::setTime(DateTime time){
180-
RTC.adjust(time);
180+
RTC.adjust(time);
181181
}

‎Cron.h

+9-9
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,16 @@
1414

1515
class Cron {
1616
public:
17-
Cron(TimedCommand **,int); // Get pointer to array of pointers
18-
virtual ~Cron();
19-
void loop();
20-
void printTime();
21-
void setTime(DateTime);
22-
boolean matchCron(String,DateTime);
17+
Cron(TimedCommand **,int); // Get pointer to array of pointers
18+
virtual ~Cron();
19+
void loop();
20+
void printTime();
21+
void setTime(DateTime);
22+
boolean matchCron(String,DateTime);
2323
private:
24-
TimedCommand **timedCommands;
25-
int timedCommandsSize;
26-
DateTime getTime();
24+
TimedCommand **timedCommands;
25+
int timedCommandsSize;
26+
DateTime getTime();
2727
};
2828

2929
#endif /* CRON_H_ */

0 commit comments

Comments
 (0)