Diff: serial_terminal.cpp

Revision:

21:896ad4241247

Parent:

20:17a69bd39cbd

Child:

22:737a154c88f3

--- a/serial_terminal.cpp	Mon Dec 17 16:10:56 2018 +0000
+++ b/serial_terminal.cpp	Wed Dec 19 12:02:43 2018 +0000
@@ -29,13 +29,13 @@
         {
             
             case (READ) :
-                if ((argnum == 0 && e_arg != ALL) || (argnum == 1 && val < 1)) {pc->printf("INVALID COMMAND\n"); break;}
+                if ((argnum == 0 && e_arg != ALL) || (argnum == 1 && val < 1)) {pc->printf("INVALID COMMAND\n\r"); break;}
                 else if (e_arg == ALL || val > SAMPLES_IN_MEMORY) SDqueue.call(SDread,-1); //read all
                 else SDqueue.call(SDread,val);  
                 break;     
                        
             case (DELETE) : 
-                if ((argnum == 0 && e_arg != ALL) || (argnum == 1 && val < 1)) {pc->printf("INVALID COMMAND\n"); break;}
+                if ((argnum == 0 && e_arg != ALL) || (argnum == 1 && val < 1)) {pc->printf("INVALID COMMAND\n\r"); break;}
                 if (e_arg == ALL || val > SAMPLES_IN_MEMORY) SDqueue.call(SDdelete,-1); //delete all
                 else SDqueue.call(SDdelete,val);
                 break;
@@ -49,13 +49,13 @@
                 (timeData->tm_year) = (timeData->tm_year)-1900;
                 if (mktime(timeData) == -1)
                 {
-                    pc->printf("SETDATE failed.\n");   
+                    pc->printf("SETDATE failed.\n\r");   
                 }
                 else
                 {
                     set_time(mktime(timeData));
                     seconds = time(NULL);
-                    pc->printf("Date updated to %s\n", ctime(&seconds));
+                    pc->printf("Date updated to %s\n\r", ctime(&seconds));
                 }
                 break;
                 
@@ -69,34 +69,34 @@
                 //check if the time is valid, if not do not update time
                 if (mktime(timeData) == -1)
                 {
-                    pc->printf("Failed.\n");   
+                    pc->printf("Failed.\n\r");   
                 }
                 else
                 {
                     set_time(mktime(timeData));
                     seconds = time(NULL);
-                    pc->printf("Time updated to %s\n", ctime(&seconds));
+                    pc->printf("Time updated to %s\n\r", ctime(&seconds));
                 }
                 break;
                 
             case (SETT) :
                 //Set the sampling rate
-                if (e_arg == ALL || val < 0.1 || val >60) {pc->printf("OUT OF RANGE\n"); break;}
-                else {sample_rate = val; sample.attach(&sampleISR, sample_rate); pc->printf("Sample rate set to %5.2f\n", val);}                
+                if (e_arg == ALL || val < 0.1 || val > 60) {pc->printf("OUT OF RANGE\n\r"); break;}
+                else {sample_rate = val; sample.attach(&sampleISR, sample_rate); pc->printf("Sample rate set to %5.2f\n\r", val);}                
                 break;
                 
             case (STATE) :
-                pc->printf("Set sampling state command received\n");
+                pc->printf("Set sampling state command received\n\r");
                 puts(arg);
                 break;
                 
             case (LOGGING) :
-                pc->printf("Set logging command received\n");
-                pc->printf("%s\n",arg);
+                pc->printf("Set logging command received\n\r");
+                pc->printf("%s\n\r",arg);
                 break;
                 
             default :
-                pc->printf("INVALID COMMAND\n");
+                pc->printf("INVALID COMMAND\n\r");
                 break;            
         }     
 }