Skip to content

Commit 7affa73

Browse files
fpistmfpistm
committed
Update Full.ino sketch
Add some return checking Update log format Signed-off-by: Frederic.Pillon <[email protected]>
1 parent e5da14e commit 7affa73

File tree

1 file changed

+110
-62
lines changed

1 file changed

+110
-62
lines changed

‎examples/Full/Full.ino

Lines changed: 110 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -32,105 +32,137 @@ void setup()
3232
delay(100);
3333

3434
/* Test mkdir() method */
35-
Serial.println("Creating 'STM32' directory");
36-
SD.mkdir("STM32");
37-
Serial.println("Creating 'ARDUINO' directory");
38-
SD.mkdir("ARDUINO");
39-
Serial.println("Creating 'ARDUINO/SD' directory");
40-
SD.mkdir("ARDUINO/SD");
35+
Serial.print("Creating 'STM32' directory...");
36+
if (SD.mkdir("STM32") == TRUE) {
37+
Serial.println("OK");
38+
} else {
39+
Serial.println("KO");
40+
}
41+
Serial.print("Creating 'ARDUINO' directory...");
42+
if (SD.mkdir("ARDUINO") == TRUE) {
43+
Serial.println("OK");
44+
} else {
45+
Serial.println("KO");
46+
}
47+
Serial.print("Creating 'ARDUINO/SD' directory...");
48+
if (SD.mkdir("ARDUINO/SD") == TRUE) {
49+
Serial.println("OK");
50+
} else {
51+
Serial.println("KO");
52+
}
4153

4254
/* Test bool operator method */
4355
Serial.print("Test bool operator...");
4456
if (!MyFile) {
4557
Serial.println("OK");
4658
} else {
47-
Serial.println("Error MyFile should not be initialized!");
59+
Serial.println("KO --> Error MyFile should not be initialized!");
4860
}
4961

5062
/* Test open() method */
51-
Serial.println("Opening 'STM32/Toremove.txt' file");
63+
Serial.print("Opening 'STM32/Toremove.txt' file...");
5264
MyFile = SD.open("STM32/Toremove.txt", FILE_WRITE);
5365
if (MyFile) {
54-
Serial.println("Closing 'STM32/Toremove.txt' file");
66+
Serial.println("OK");
67+
Serial.print("Closing 'STM32/Toremove.txt' file...");
5568
MyFile.close();
69+
Serial.println("OK");
5670
} else {
57-
Serial.println("Error to open 'STM32/Toremove.txt' file");
71+
Serial.println("KO --> Error to open 'STM32/Toremove.txt' file");
5872
}
59-
Serial.println("Opening 'ARDUINO/SD/ARDUINO_SD_TEXT.txt' file");
73+
Serial.print("Opening 'ARDUINO/SD/ARDUINO_SD_TEXT.txt' file...");
6074
MyFile = SD.open("ARDUINO/SD/ARDUINO_SD_TEXT.txt", FILE_WRITE);
6175
if (MyFile) {
76+
Serial.println("OK");
6277
/* Test print() method */
63-
Serial.print("writing \"");
78+
Serial.print(" writing \"");
6479
Serial.print((const char*)wtext);
65-
Serial.println("\" into ARDUINO_SD_TEXT.txt file");
80+
Serial.print("\" into ARDUINO_SD_TEXT.txt file...");
6681
byteswritten = MyFile.print((const char*)wtext);
6782
byteswritten += MyFile.print("\n");
6883
Serial.print(byteswritten, DEC);
6984
Serial.println(" bytes written.");
70-
Serial.println("Closing 'ARDUINO/SD/ARDUINO_SD_TEXT.txt' file");
85+
Serial.print("Closing 'ARDUINO/SD/ARDUINO_SD_TEXT.txt' file...");
7186
MyFile.close();
87+
Serial.println("OK");
7288
} else {
73-
Serial.println("Error to open 'ARDUINO/SD/ARDUINO_SD_TEXT.txt' file");
89+
Serial.println("KO --> Error to open 'ARDUINO/SD/ARDUINO_SD_TEXT.txt' file");
7490
}
7591

76-
Serial.println("Opening 'ARDUINO/SD/ARDUINO_SD_TEXT.txt' file");
92+
Serial.print("Opening 'ARDUINO/SD/ARDUINO_SD_TEXT.txt' file...");
7793
MyFile = SD.open("ARDUINO/SD/ARDUINO_SD_TEXT.txt");
7894
if (MyFile) {
95+
Serial.println("OK");
96+
Serial.print(" reading ARDUINO/SD/ARDUINO_SD_TEXT.txt file...");
7997
bytesread = MyFile.read(rtext, MyFile.size());
80-
Serial.println("Closing 'ARDUINO/SD/ARDUINO_SD_TEXT.txt' file");
98+
Serial.print(bytesread, DEC);
99+
Serial.println(" bytes read.");
100+
Serial.print("Closing 'ARDUINO/SD/ARDUINO_SD_TEXT.txt' file...");
81101
MyFile.close();
102+
Serial.println("OK");
82103
} else {
83-
Serial.println("Error to open 'ARDUINO/SD/ARDUINO_SD_TEXT.txt' file");
104+
Serial.println("KO -- > Error to open 'ARDUINO/SD/ARDUINO_SD_TEXT.txt' file");
84105
}
85106

86-
Serial.println("Opening 'ARDUINO/SD/TEXT.txt' file");
107+
Serial.print("Opening 'ARDUINO/SD/TEXT.txt' file...");
87108
MyFile = SD.open("ARDUINO/SD/TEXT.txt", FILE_WRITE);
88109
if (MyFile) {
110+
Serial.println("OK");
111+
Serial.print(" writing and flush \"");
112+
Serial.print((const char*)rtext);
113+
Serial.print("\" into ARDUINO/SD/TEXT.txt file...");
89114
byteswritten = MyFile.print((const char*)rtext);
90115
MyFile.flush();
91-
Serial.println("Closing 'ARDUINO/SD/TEXT.txt' file");
116+
Serial.print(byteswritten, DEC);
117+
Serial.println(" bytes written.");
118+
Serial.print("Closing 'ARDUINO/SD/TEXT.txt' file...");
92119
MyFile.close();
120+
Serial.println("OK");
93121
} else {
94-
Serial.println("Error to open 'ARDUINO/SD/TEXT.txt' file");
122+
Serial.println("KO --> Error to open 'ARDUINO/SD/TEXT.txt' file");
95123
}
96124

97-
Serial.println("Opening 'ARDUINO/SD/TEXT.txt' file");
125+
Serial.print("Opening 'ARDUINO/SD/TEXT.txt' file...");
98126
MyFile = SD.open("ARDUINO/SD/TEXT.txt");
99127
if (MyFile) {
128+
Serial.println("OK");
100129
/* Test size() method */
101130
file_size = MyFile.size();
102-
Serial.print("TEXT.txt size: ");
131+
Serial.print(" TEXT.txt size: ");
103132
Serial.println(file_size);
104133

105134
/* Test position and seek method */
106-
Serial.print("TEXT.txt position value: ");
135+
Serial.print(" TEXT.txt position value: ");
107136
Serial.println(MyFile.position());
137+
Serial.print(" TEXT.txt seek value over size: ");
108138
if (!MyFile.seek(MyFile.size() + 1)) {
109-
Serial.println("TEXT.txt seek value over size: OK");
139+
Serial.println("OK");
110140
} else {
111-
Serial.println("TEXT.txt seek value over size: KO");
141+
Serial.println("KO");
112142
}
143+
Serial.print(" TEXT.txt seek value to size: ");
113144
if (MyFile.seek(MyFile.size())) {
114-
Serial.println("TEXT.txt seek value to size: OK");
145+
Serial.println("OK");
115146
} else {
116-
Serial.println("TEXT.txt seek value to size: KO");
147+
Serial.println("KO");
117148
}
118-
Serial.print("TEXT.txt position value: ");
149+
Serial.print(" TEXT.txt position value: ");
119150
Serial.println(MyFile.position());
120-
151+
Serial.print(" TEXT.txt seek value to 0: ");
121152
if (MyFile.seek(0)) {
122-
Serial.println("TEXT.txt seek value to 0: OK");
153+
Serial.println("OK");
123154
} else {
124-
Serial.println("TEXT.txt seek value to 0: KO");
155+
Serial.println("KO");
125156
}
126-
Serial.print("TEXT.txt position value: ");
157+
Serial.print(" TEXT.txt position value: ");
127158
Serial.println(MyFile.position());
128159

129160
/* Test peek() method */
130-
Serial.println("TEXT.txt peek (10 times): ");
161+
Serial.println(" TEXT.txt peek (10 times): ");
131162
for (i = 0; i < 10; i++)
132163
{
133164
peek_val = MyFile.peek();
165+
Serial.print(" ");
134166
Serial.print(peek_val);
135167
Serial.print(" '");
136168
Serial.write(peek_val);
@@ -139,109 +171,125 @@ void setup()
139171
i = 0;
140172

141173
/* Test available() and read() methods */
142-
Serial.println("TEXT.txt content read byte per byte: ");
174+
Serial.println(" TEXT.txt content read byte per byte: ");
143175
while (MyFile.available())
144176
{
145177
rtext[i] = (uint8_t)MyFile.read();
178+
Serial.print(" ");
146179
Serial.print(rtext[i]);
147180
Serial.print(" '");
148181
Serial.write(rtext[i]);
149182
Serial.println("'");
150183
i++;
151184
}
152185
/* Test close method */
153-
Serial.println("Closing 'ARDUINO/SD/TEXT.txt' file");
186+
Serial.print("Closing 'ARDUINO/SD/TEXT.txt' file...");
154187
MyFile.close();
188+
Serial.println("OK");
155189
} else {
156-
Serial.println("Error to open 'ARDUINO/SD/TEXT.txt' file");
190+
Serial.println("KO --> Error to open 'ARDUINO/SD/TEXT.txt' file");
157191
}
158192

159193
/* Test isDirectory() method */
194+
Serial.print("Opening 'STM32' dir...");
160195
MyFile = SD.open("STM32");
161196
if (MyFile) {
162-
Serial.print("Is 'STM32' is a dir: ");
163-
if (MyFile.isDirectory())
197+
Serial.println("OK");
198+
Serial.print("Is 'STM32' is a dir...");
199+
if (MyFile.isDirectory()) {
164200
Serial.println("OK");
165-
else
201+
} else {
166202
Serial.println("KO");
203+
}
167204
MyFile.close();
168205
} else {
169-
Serial.println("Error to open 'STM32' dir");
206+
Serial.println("KO --> Error to open 'STM32' dir");
170207
}
171208

172-
Serial.println("Opening 'STM32/Toremove.txt' file");
209+
Serial.print("Opening 'STM32/Toremove.txt' file...");
173210
MyFile = SD.open("STM32/Toremove.txt");
174211
if (MyFile) {
175-
Serial.print("Is 'STM32/Toremove.txt' is a file: ");
176-
if (MyFile.isDirectory())
212+
Serial.println("OK");
213+
Serial.print(" Is 'STM32/Toremove.txt' is a file: ");
214+
if (MyFile.isDirectory()) {
177215
Serial.println("KO");
178-
else
216+
} else {
179217
Serial.println("OK");
180-
Serial.println("Closing 'STM32/Toremove.txt' file");
218+
}
219+
Serial.print("Closing 'STM32/Toremove.txt' file...");
181220
MyFile.close();
221+
Serial.println("OK");
182222
} else {
183-
Serial.println("Error to open 'STM32/Toremove.txt' file");
223+
Serial.println("KO --> Error to open 'STM32/Toremove.txt' file");
184224
}
185225
/* Test exists(), remove() and rmdir() methods */
186226
Serial.print("Removing 'STM32/Toremove.txt' file...");
187227
while (SD.exists("STM32/Toremove.txt") == TRUE)
188228
{
189229
SD.remove("STM32/Toremove.txt");
190230
}
191-
Serial.println("done");
231+
Serial.println("OK");
192232

193233
Serial.print("Removing 'STM32' dir...");
194234
while (SD.exists("STM32") == TRUE)
195235
{
196236
SD.rmdir("STM32");
197237
}
198-
Serial.println("done");
238+
Serial.println("OK");
199239

200240
/* Test println(), println(data) methods */
201-
Serial.println("Opening 'ARDUINO/SD/PRINT.txt' file");
241+
Serial.print("Opening 'ARDUINO/SD/PRINT.txt' file...");
202242
MyFile = SD.open("ARDUINO/SD/PRINT.txt", FILE_WRITE);
203243
if (MyFile) {
244+
Serial.println("OK");
204245
String str = String("This is a String object on line 7");
205-
Serial.print("Printing to 'ARDUINO/SD/PRINT.txt' file...");
246+
Serial.print(" Printing to 'ARDUINO/SD/PRINT.txt' file...");
206247
MyFile.println("This should be line 1");
207248
MyFile.println();
208249
MyFile.println("This should be line 3");
209250
MyFile.println("This should be line 4");
210251
MyFile.println();
211252
MyFile.println("This should be line 6");
212253
MyFile.println(str);
213-
Serial.println("done");
214-
Serial.println("Closing 'ARDUINO/SD/PRINT.txt' file");
254+
Serial.println("OK");
255+
Serial.print("Closing 'ARDUINO/SD/PRINT.txt' file");
256+
Serial.println("OK");
215257
MyFile.close();
216258
} else {
217-
Serial.println("Error to open 'ARDUINO/SD/PRINT.txt' file");
259+
Serial.println("KO --> Error to open 'ARDUINO/SD/PRINT.txt' file");
218260
}
219261

220262
/* Test write(buf, len) method */
221-
Serial.println("Opening 'ARDUINO/SD/WRITE.txt' file");
263+
Serial.print("Opening 'ARDUINO/SD/WRITE.txt' file...");
222264
MyFile = SD.open("ARDUINO/SD/WRITE.txt", FILE_WRITE);
223265
if (MyFile) {
224-
Serial.print("Writing 'ARDUINO/SD/WRITE.txt' file: ");
266+
Serial.println("OK");
267+
Serial.print(" Writing 'ARDUINO/SD/WRITE.txt' file: ");
225268
byteswritten = MyFile.write(wtext, BUFFERSIZE);
226269
Serial.print(byteswritten);
227270
Serial.println(" bytes written");
228-
Serial.println("Closing 'ARDUINO/SD/WRITE.txt' file");
271+
Serial.print("Closing 'ARDUINO/SD/WRITE.txt' file");
229272
MyFile.close();
273+
Serial.println("OK");
230274
} else {
231-
Serial.println("Error to open 'ARDUINO/SD/WRITE.txt' file");
275+
Serial.println("KO --> Error to open 'ARDUINO/SD/WRITE.txt' file");
232276
}
233277

234278
/* Test read(buf, len) method */
235-
Serial.println("Opening 'ARDUINO/SD/WRITE.txt' file");
279+
Serial.print("Opening 'ARDUINO/SD/WRITE.txt' file...");
236280
MyFile = SD.open("ARDUINO/SD/WRITE.txt");
237281
if (MyFile) {
238-
Serial.println("Reading 'ARDUINO/SD/WRITE.txt' file:");
282+
Serial.println("OK");
283+
Serial.print(" Reading 'ARDUINO/SD/WRITE.txt' file: ");
239284
bytesread = MyFile.read(rtext, MyFile.size());
285+
Serial.print(bytesread);
286+
Serial.println(" bytes read");
240287
Serial.println((const char*)rtext);
241-
Serial.println("Closing 'ARDUINO/SD/WRITE.txt' file");
288+
Serial.print("Closing 'ARDUINO/SD/WRITE.txt' file...");
242289
MyFile.close();
290+
Serial.println("OK");
243291
} else {
244-
Serial.println("Error to open 'ARDUINO/SD/WRITE.txt' file");
292+
Serial.println("KO --> Error to open 'ARDUINO/SD/WRITE.txt' file");
245293
}
246294
Serial.println("###### End of the SD tests ######");
247295
}

0 commit comments

Comments
 (0)