Diff: main.cpp

Revision:

44:075fa63d5df1

Parent:

43:05aa1fb68946

Child:

45:5e0942088e31

diff -r 05aa1fb68946 -r 075fa63d5df1 main.cpp
--- a/main.cpp	Tue May 03 16:35:44 2016 +0000
+++ b/main.cpp	Tue May 03 17:42:13 2016 +0000
@@ -544,9 +544,6 @@
 //////////////////////////////////////////////////////////////
 void check_stop()   // this checks if it's time to stop and shutdown
 {
-    //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-    //UPDATE THIS TO WORK WITH ST RTC INSTEAD
-    //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
    
     if(timecompare(startAndEndTime[6], startAndEndTime[7], startAndEndTime[8], startAndEndTime[9], startAndEndTime[10], startAndEndTime[11])) {
         pbKill = 0; // this is were we shut everything down
@@ -560,7 +557,7 @@
 //////////////////////////////////////////////////////////////
 void log_data()
 {
-    //Get time and set RTC 
+    //Get RTC time(s)
     ///////////////////////////
     RTC_UPAS.get_time(); 
     time_t seconds = time(NULL);
@@ -584,11 +581,7 @@
     strftime(secstr, 4, "%S", localtime(&seconds));
     stSec = atoi(secstr);
 
-    pc.printf("%s,%s,%d,%s,%d,%s,%d,%s,%d,%s,%d,%s,%d\r\n", timestr,yrstr,stYr,mostr,stMo,daystr,stDay,hrstr,stHr,minstr,stMin,secstr,stSec);
-    
- 
-    
-
+    //pc.printf("%s,%s,%d,%s,%d,%s,%d,%s,%d,%s,%d,%s,%d\r\n", timestr,yrstr,stYr,mostr,stMo,daystr,stDay,hrstr,stHr,minstr,stMin,secstr,stSec);
     
     //Get Sensor Data except GPS
     ////////////////////////////
@@ -616,8 +609,8 @@
     if(bVolt > 1750 && amps > 8191) {
                RGB_LED.set_led(0,0,0);
                //RGB_LED.set_led(0,1,0);
-    //Check for battery with ~2 hours left of runtime at 2lpm or if after 8pm to remind user to plug in sampler            
-    }else if(amps > 8191 && (RTC_UPAS.hour >=20 || bVolt < 1500)) {
+    //Check for battery with ~2 hours left of runtime at 2lpm to remind user to plug in sampler            
+    }else if(amps > 8191 && bVolt < 1500) {
         if(ledOn) {
             RGB_LED.set_led(0,0,0);
             ledOn = 0;
@@ -891,6 +884,10 @@
     uint8_t subjectLabelOriginal[15] = {0,};
     E2PROM.read(0x00001, subjectLabelOriginal,15);
     
+    //Get the cartridge ID information
+    uint8_t cartridgeID[3] = {0,};
+    E2PROM.read(0x00070, cartridgeID,3);
+    
     //Get the proper serial number
     uint8_t serialBytes[2] = {0,};
     E2PROM.read(0x00034,serialBytes,2);    
@@ -947,19 +944,17 @@
     while(!timecompare(startAndEndTime[0], startAndEndTime[1], startAndEndTime[2], startAndEndTime[3], startAndEndTime[4], startAndEndTime[5])) {  // this while waits for the start time by looping until the start time
             wait(0.5);
             
-            //RTC_UPAS.get_time(); 
-
     }
 
     time_t seconds = time(NULL);
     strftime(timestr, 32, "%y-%m-%d-%H=%M=%S", localtime(&seconds));
     RTC_UPAS.get_time(); 
     if(tempSerialNum < 18){
-        sprintf(filename, "/sd/MS%04dLOG_%02d-%02d-%02d_%02d=%02d=%02d_%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c.txt",serial_num,RTC_UPAS.year,RTC_UPAS.month,RTC_UPAS.date,RTC_UPAS.hour,RTC_UPAS.minutes,RTC_UPAS.seconds,subjectLabelOriginal[0],subjectLabelOriginal[1],subjectLabelOriginal[2],subjectLabelOriginal[3],subjectLabelOriginal[4],subjectLabelOriginal[5],subjectLabelOriginal[6],subjectLabelOriginal[7],subjectLabelOriginal[8],subjectLabelOriginal[9],subjectLabelOriginal[10],subjectLabelOriginal[11],subjectLabelOriginal[12],subjectLabelOriginal[13],subjectLabelOriginal[14]);
+        sprintf(filename, "/sd/MS%04dLOG_%02d-%02d-%02d_%02d=%02d=%02d_%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c_%c%c%c.txt",serial_num,RTC_UPAS.year,RTC_UPAS.month,RTC_UPAS.date,RTC_UPAS.hour,RTC_UPAS.minutes,RTC_UPAS.seconds,subjectLabelOriginal[0],subjectLabelOriginal[1],subjectLabelOriginal[2],subjectLabelOriginal[3],subjectLabelOriginal[4],subjectLabelOriginal[5],subjectLabelOriginal[6],subjectLabelOriginal[7],subjectLabelOriginal[8],subjectLabelOriginal[9],subjectLabelOriginal[10],subjectLabelOriginal[11],subjectLabelOriginal[12],subjectLabelOriginal[13],subjectLabelOriginal[14],cartridgeID[0],cartridgeID[1],cartridgeID[2]);
     
     }
     else{
-        sprintf(filename, "/sd/PS%04dLOG_%02d-%02d-%02d_%02d=%02d=%02d_%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c.txt",serial_num,RTC_UPAS.year,RTC_UPAS.month,RTC_UPAS.date,RTC_UPAS.hour,RTC_UPAS.minutes,RTC_UPAS.seconds,subjectLabelOriginal[0],subjectLabelOriginal[1],subjectLabelOriginal[2],subjectLabelOriginal[3],subjectLabelOriginal[4],subjectLabelOriginal[5],subjectLabelOriginal[6],subjectLabelOriginal[7],subjectLabelOriginal[8],subjectLabelOriginal[9],subjectLabelOriginal[10],subjectLabelOriginal[11],subjectLabelOriginal[12],subjectLabelOriginal[13],subjectLabelOriginal[14]);
+        sprintf(filename, "/sd/PS%04dLOG_%02d-%02d-%02d_%02d=%02d=%02d_%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c_%c%c%c.txt",serial_num,RTC_UPAS.year,RTC_UPAS.month,RTC_UPAS.date,RTC_UPAS.hour,RTC_UPAS.minutes,RTC_UPAS.seconds,subjectLabelOriginal[0],subjectLabelOriginal[1],subjectLabelOriginal[2],subjectLabelOriginal[3],subjectLabelOriginal[4],subjectLabelOriginal[5],subjectLabelOriginal[6],subjectLabelOriginal[7],subjectLabelOriginal[8],subjectLabelOriginal[9],subjectLabelOriginal[10],subjectLabelOriginal[11],subjectLabelOriginal[12],subjectLabelOriginal[13],subjectLabelOriginal[14],cartridgeID[0],cartridgeID[1],cartridgeID[2]);
     }
     //sprintf(filename, "/sd/UPAS_TboardtestLog_%s_%c%c%c%c%c%c%c%c.txt", timestr,subjectLabelOriginal[0],subjectLabelOriginal[1],subjectLabelOriginal[2],subjectLabelOriginal[3],subjectLabelOriginal[4],subjectLabelOriginal[5],subjectLabelOriginal[6],subjectLabelOriginal[7]);
     //sprintf(filename, "/sd/UPAS_TboardtestLog_%s.txt", timestr);