Skip to content

Commit 6c90bae

Browse files
adrian2793adrian2793
authored
Update Serial-Monitor.h
Signed-off-by: Adrian <[email protected]>
1 parent a58d0e6 commit 6c90bae

File tree

1 file changed

+72
-74
lines changed

1 file changed

+72
-74
lines changed

‎src/Serial-Monitor.h‎

Lines changed: 72 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@ int digitalRead_11 = digitalRead(11);
1818
int digitalRead_12 = digitalRead(12);
1919
int digitalRead_13 = digitalRead(13);
2020

21-
Serial.begin(9600);
22-
2321
class SerialMonitor {
2422
public:
2523
initialize();
@@ -45,127 +43,127 @@ class SerialMonitor {
4543

4644
int SerialMonitor::initialize() {
4745
value = this->analogRead0();
48-
if(value == NULL) {
49-
Serial.println("analogRead0 → NULL");
46+
if(value == 0) {
47+
Serial.println("analogRead0 → 0");
5048
} else {
5149
Serial.print("analogRead0 → ");
5250
Serial.println(value);
5351
}
5452
value = this->analogRead1();
55-
if(value == NULL) {
56-
Serial.println("analogRead1 → NULL");
53+
if(value == 0) {
54+
Serial.println("analogRead1 → 0");
5755
} else {
5856
Serial.print("analogRead1 → ");
5957
Serial.println(value);
6058
}
6159
value = this->analogRead2();
62-
if(value == NULL) {
63-
Serial.println("analogRead2 → NULL");
60+
if(value == 0) {
61+
Serial.println("analogRead2 → 0");
6462
} else {
6563
Serial.print("analogRead2 → ");
6664
Serial.println(value);
6765
}
6866
value = this->analogRead3();
69-
if(value == NULL) {
70-
Serial.println("analogRead3 → NULL");
67+
if(value == 0) {
68+
Serial.println("analogRead3 → 0");
7169
} else {
7270
Serial.print("analogRead3 → ");
7371
Serial.println(value);
7472
}
7573
value = this->analogRead4();
76-
if(value == NULL) {
77-
Serial.println("analogRead4 → NULL");
74+
if(value == 0) {
75+
Serial.println("analogRead4 → 0");
7876
} else {
7977
Serial.print("analogRead4 → ");
8078
Serial.println(value);
8179
}
8280
value = this->analogRead5();
83-
if(value == NULL) {
84-
Serial.println("analogRead5 → NULL");
81+
if(value == 0) {
82+
Serial.println("analogRead5 → 0");
8583
} else {
8684
Serial.print("analogRead5 → ");
8785
Serial.println(value);
8886
}
8987
value = this->digitalRead2();
90-
if(value == NULL) {
91-
Serial.println("digitalRead2 → NULL");
88+
if(value == 0) {
89+
Serial.println("digitalRead2 → 0");
9290
} else {
9391
Serial.print("digitalRead2 → ");
9492
Serial.println(value);
9593
}
9694
value = this->digitalRead3();
97-
if(value == NULL) {
98-
Serial.println("digitalRead3 → NULL");
95+
if(value == 0) {
96+
Serial.println("digitalRead3 → 0");
9997
} else {
10098
Serial.print("digitalRead3 → ");
10199
Serial.println(value);
102100
}
103101
value = this->digitalRead4();
104-
if(value == NULL) {
105-
Serial.println("digitalRead4 → NULL");
102+
if(value == 0) {
103+
Serial.println("digitalRead4 → 0");
106104
} else {
107105
Serial.print("digitalRead4 → ");
108106
Serial.println(value);
109107
}
110108
value = this->digitalRead5();
111-
if(value == NULL) {
112-
Serial.println("digitalRead5 → NULL");
109+
if(value == 0) {
110+
Serial.println("digitalRead5 → 0");
113111
} else {
114112
Serial.print("digitalRead5 → ");
115113
Serial.println(value);
116114
}
117115
value = this->digitalRead6();
118-
if(value == NULL) {
119-
Serial.println("digitalRead6 → NULL");
116+
if(value == 0) {
117+
Serial.println("digitalRead6 → 0");
120118
} else {
121119
Serial.print("digitalRead6 → ");
122120
Serial.println(value);
123121
}
124122
value = this->digitalRead7();
125-
if(value == NULL) {
126-
Serial.println("digitalRead7 → NULL");
123+
if(value == 0) {
124+
Serial.println("digitalRead7 → 0");
127125
} else {
128126
Serial.print("digitalRead7 → ");
129127
Serial.println(value);
130128
}
131129
value = this->digitalRead8();
132-
if(value == NULL) {
133-
Serial.println("digitalRead8 → NULL");
130+
if(value == 0) {
131+
Serial.println("digitalRead8 → 0");
134132
} else {
135133
Serial.print("digitalRead8 → ");
136134
Serial.println(value);
137135
}
138136
value = this->digitalRead9();
139-
if(value == NULL) {
140-
Serial.println("digitalRead9 → NULL");
137+
if(value == 0) {
138+
Serial.println("digitalRead9 → 0");
141139
} else {
142140
Serial.print("digitalRead9 → ");
143141
Serial.println(value);
144142
}
145143
value = this->digitalRead10();
146-
if(value == NULL) {
147-
Serial.println("digitalRead10 → NULL");
144+
if(value == 0) {
145+
Serial.println("digitalRead10 → 0");
148146
} else {
149147
Serial.print("digitalRead10 → ");
150148
Serial.println(value);
151149
}
152150
value = this->digitalRead11();
153-
if(value == NULL) {
154-
Serial.println("digitalRead11 → NULL");
151+
if(value == 0) {
152+
Serial.println("digitalRead11 → 0");
155153
} else {
156154
Serial.print("digitalRead11 → ");
157155
Serial.println(value);
158156
}
159157
value = this->digitalRead12();
160-
if(value == NULL) {
161-
Serial.println("digitalRead12 → NULL");
158+
if(value == 0) {
159+
Serial.println("digitalRead12 → 0");
162160
} else {
163161
Serial.print("digitalRead12 → ");
164162
Serial.println(value);
165163
}
166164
value = this->digitalRead13();
167-
if(value == NULL) {
168-
Serial.println("digitalRead13 → NULL");
165+
if(value == 0) {
166+
Serial.println("digitalRead13 → 0");
169167
} else {
170168
Serial.print("digitalRead13 → ");
171169
Serial.println(value);
@@ -174,144 +172,144 @@ int SerialMonitor::initialize() {
174172
}
175173

176174
int SerialMonitor::analogRead0() {
177-
if(analogRead_0 == NULL) {
178-
return NULL;
175+
if(analogRead_0 == 0) {
176+
return 0;
179177
} else {
180178
return analogRead_0;
181179
}
182180
}
183181

184182
int SerialMonitor::analogRead1() {
185-
if(analogRead_1 == NULL) {
186-
return NULL;
183+
if(analogRead_1 == 0) {
184+
return 0;
187185
} else {
188186
return analogRead_1;
189187
}
190188
}
191189

192190
int SerialMonitor::analogRead2() {
193-
if(analogRead_2 == NULL) {
194-
return NULL;
191+
if(analogRead_2 == 0) {
192+
return 0;
195193
} else {
196194
return analogRead_2;
197195
}
198196
}
199197

200198
int SerialMonitor::analogRead3() {
201-
if(analogRead_3 == NULL) {
202-
return NULL;
199+
if(analogRead_3 == 0) {
200+
return 0;
203201
} else {
204202
return analogRead_3;
205203
}
206204
}
207205

208206
int SerialMonitor::analogRead4() {
209-
if(analogRead_4 == NULL) {
210-
return NULL;
207+
if(analogRead_4 == 0) {
208+
return 0;
211209
} else {
212210
return analogRead_4;
213211
}
214212
}
215213

216214
int SerialMonitor::analogRead5() {
217-
if(analogRead_5 == NULL) {
218-
return NULL;
215+
if(analogRead_5 == 0) {
216+
return 0;
219217
} else {
220218
return analogRead_5;
221219
}
222220
}
223221

224222
int SerialMonitor::digitalRead2() {
225-
if(digitalRead_2 == NULL) {
226-
return NULL;
223+
if(digitalRead_2 == 0) {
224+
return 0;
227225
} else {
228226
return digitalRead_2;
229227
}
230228
}
231229

232230
int SerialMonitor::digitalRead3() {
233-
if(digitalRead_3 == NULL) {
234-
return NULL;
231+
if(digitalRead_3 == 0) {
232+
return 0;
235233
} else {
236234
return digitalRead_3;
237235
}
238236
}
239237

240238
int SerialMonitor::digitalRead4() {
241-
if(digitalRead_4 == NULL) {
242-
return NULL;
239+
if(digitalRead_4 == 0) {
240+
return 0;
243241
} else {
244242
return digitalRead_4;
245243
}
246244
}
247245

248246
int SerialMonitor::digitalRead5() {
249-
if(digitalRead_5 == NULL) {
250-
return NULL;
247+
if(digitalRead_5 == 0) {
248+
return 0;
251249
} else {
252250
return digitalRead_5;
253251
}
254252
}
255253

256254
int SerialMonitor::digitalRead6() {
257-
if(digitalRead_6 == NULL) {
258-
return NULL;
255+
if(digitalRead_6 == 0) {
256+
return 0;
259257
} else {
260258
return digitalRead_6;
261259
}
262260
}
263261

264262
int SerialMonitor::digitalRead7() {
265-
if(digitalRead_7 == NULL) {
266-
return NULL;
263+
if(digitalRead_7 == 0) {
264+
return 0;
267265
} else {
268266
return digitalRead_7;
269267
}
270268
}
271269

272270
int SerialMonitor::digitalRead8() {
273-
if(digitalRead_8 == NULL) {
274-
return NULL;
271+
if(digitalRead_8 == 0) {
272+
return 0;
275273
} else {
276274
return digitalRead_8;
277275
}
278276
}
279277

280278
int SerialMonitor::digitalRead9() {
281-
if(digitalRead_9 == NULL) {
282-
return NULL;
279+
if(digitalRead_9 == 0) {
280+
return 0;
283281
} else {
284282
return digitalRead_9;
285283
}
286284
}
287285

288286
int SerialMonitor::digitalRead10() {
289-
if(digitalRead_10 == NULL) {
290-
return NULL;
287+
if(digitalRead_10 == 0) {
288+
return 0;
291289
} else {
292290
return digitalRead_10;
293291
}
294292
}
295293

296294
int SerialMonitor::digitalRead11() {
297-
if(digitalRead_11 == NULL) {
298-
return NULL;
295+
if(digitalRead_11 == 0) {
296+
return 0;
299297
} else {
300298
return digitalRead_11;
301299
}
302300
}
303301

304302
int SerialMonitor::digitalRead12() {
305-
if(digitalRead_12 == NULL) {
306-
return NULL;
303+
if(digitalRead_12 == 0) {
304+
return 0;
307305
} else {
308306
return digitalRead_12;
309307
}
310308
}
311309

312310
int SerialMonitor::digitalRead13() {
313-
if(digitalRead_13 == NULL) {
314-
return NULL;
311+
if(digitalRead_13 == 0) {
312+
return 0;
315313
} else {
316314
return digitalRead_13;
317315
}

0 commit comments

Comments
 (0)