Diff: source/sdcard.cpp

Revision:

77:c2e22d1e5d44

Parent:

66:0d43bd7ed179

Child:

80:6e3eb8246ced

diff -r a4dacab0d3dd -r c2e22d1e5d44 source/sdcard.cpp
--- a/source/sdcard.cpp	Fri Apr 06 11:54:14 2018 +0000
+++ b/source/sdcard.cpp	Sat Apr 07 17:43:22 2018 +0000
@@ -362,7 +362,7 @@
     }
     printf("success!\n\r");
 
-    //open file for write
+    //open file for append
     printf("open file %s...",filepath);
     FILE *fp = fopen(filepath, "a");
     if(fp == NULL) {
@@ -371,8 +371,9 @@
     }
     printf("success!\n\r");
     printf("writing to SD card...");
-    fprintf(fp,"%d;%02d;%02d;%02d;%02d;%02d;%d;%02d;%02d;%s;\n\r",outputTime.weekday,outputTime.day,outputTime.month,outputTime.year,medicationTime.hour,medicationTime.minute,success,outputTime.hour,outputTime.minute,medication.container);
-
+    fprintf(fp,"%d;%02d;%02d;%02d;%02d;%02d;%d;%02d;%02d;",outputTime.weekday,outputTime.day,outputTime.month,outputTime.year,medicationTime.hour,medicationTime.minute,success,outputTime.hour,outputTime.minute);
+    fprintf(fp,"%d%d%d%d%d%d\r\n", medication.container[0], medication.container[1], medication.container[2], medication.container[3], medication.container[4], medication.container[5]);
+    
     printf("done!\r\n");
     
     //close file
@@ -387,7 +388,7 @@
     return EXIT_SUCCESS;
 }
 
-int delete_medProtocol()
+int erase_medProtocol()
 {
     char filepath[] = "/sd/protocol/medProtocolUser1.txt"; 
     
@@ -403,13 +404,36 @@
         return EXIT_FAILURE;
     }
 
-    //delete file
-    sd.remove(filepath);
+    //open file for write
+    printf("\n\ropen file %s...",filepath);
+    FILE *fp = fopen(filepath, "w");
+    if(fp == NULL) {
+        printf("failed!\n\r");
+        return EXIT_FAILURE;
+    }
+    
+    //close file
+    printf("\n\rclosing file %s...",filepath);
+    fclose(fp);
+
     strcpy(filepath, "/sd/protocol/medProtocolUser2.txt"); 
-    sd.remove(filepath);
+    
+    //open file for write
+    printf("\n\ropen file %s...",filepath);
+    fp = fopen(filepath, "w");
+    if(fp == NULL) {
+        printf("failed!\n\r");
+        return EXIT_FAILURE;
+    }
+    
+    //close file
+    printf("closing file %s...",filepath);
+    fclose(fp);
     
     sd.unmount();
     
+    printf("done");
+    
     return EXIT_SUCCESS;
 }
 
@@ -439,19 +463,19 @@
     }
     printf("success!\n\r");
     printf("writing to SD card...");
-    fprintf(fp,"%s\n\r", med1);
-    fprintf(fp,"%02d\n\r", medInventory.container[0]);
-    fprintf(fp,"%s\n\r", med2);
-    fprintf(fp,"%02d\n\r", medInventory.container[1]);
-    fprintf(fp,"%s\n\r", med3);
-    fprintf(fp,"%02d\n\r", medInventory.container[2]);
-    fprintf(fp,"%s\n\r", med4);
-    fprintf(fp,"%02d\n\r", medInventory.container[3]);
-    fprintf(fp,"%s\n\r", med5);
-    fprintf(fp,"%02d\n\r", medInventory.container[4]);
-    fprintf(fp,"%s\n\r", med6);
-    fprintf(fp,"%02d\n\r", medInventory.container[5]);
-    fprintf(fp,"%02d;%02d;%02d;%02d;%02d;", currentTime.day, currentTime.month, currentTime.year, currentTime.hour, currentTime.minute);
+    fprintf(fp,"%s\r\n", med1);
+    fprintf(fp,"%02d\r\n", medInventory.container[0]);
+    fprintf(fp,"%s\r\n", med2);
+    fprintf(fp,"%02d\r\n", medInventory.container[1]);
+    fprintf(fp,"%s\r\n", med3);
+    fprintf(fp,"%02d\r\n", medInventory.container[2]);
+    fprintf(fp,"%s\r\n", med4);
+    fprintf(fp,"%02d\r\n", medInventory.container[3]);
+    fprintf(fp,"%s\r\n", med5);
+    fprintf(fp,"%02d\r\n", medInventory.container[4]);
+    fprintf(fp,"%s\r\n", med6);
+    fprintf(fp,"%02d\r\n", medInventory.container[5]);
+    fprintf(fp,"%02d;%02d;%02d;%02d;%02d;\r\n", currentTime.day, currentTime.month, currentTime.year, currentTime.hour, currentTime.minute);
     
     printf("done!\r\n");
     
@@ -484,7 +508,7 @@
     }
     printf("success!\n\r");
 
-    //open file for write
+    //open file for append
     printf("open file %s...",filepath);
     FILE *fp = fopen(filepath, "a");
     if(fp == NULL) {
@@ -493,7 +517,7 @@
     }
     printf("success!\n\r");
     printf("writing to SD card...");
-    fprintf(fp,"%02d;%02d;%02d;%02d;%02d;%s\n\r", time.day, time.month, time.year, time.hour, time.minute, error);
+    fprintf(fp,"%02d;%02d;%02d;%02d;%02d;%s\r\n", time.day, time.month, time.year, time.hour, time.minute, error);
     
     printf("done!\r\n");
     
@@ -509,7 +533,7 @@
     return EXIT_SUCCESS;
 }
 
-int delete_medError()
+int erase_medError()
 {
     char filepath[] = "/sd/protocol/Error.txt"; 
     
@@ -525,10 +549,21 @@
         return EXIT_FAILURE;
     }
 
-    //delete file
-    sd.remove(filepath);
+    //open file for write
+    printf("open file %s...",filepath);
+    FILE *fp = fopen(filepath, "w");
+    if(fp == NULL) {
+        printf("failed!\n\r");
+        return EXIT_FAILURE;
+    }
+    
+    //close file
+    printf("closing file %s...",filepath);
+    fclose(fp);
     
     sd.unmount();
     
+    printf("done");
+    
     return EXIT_SUCCESS;
 }
\ No newline at end of file