Diff: main.cpp

Revision:

15:e564c8031c47

Parent:

14:7cdb643da356

Child:

16:577cb22cec99

--- a/main.cpp	Tue Mar 22 15:24:29 2016 +0000
+++ b/main.cpp	Tue Mar 22 15:50:31 2016 +0000
@@ -516,7 +516,7 @@
     fprintf(fp, "%1.3f,%5.1f,%1.1f,%1.1f,%1.1f,%1.1f,", volflow, sampledVol, accel_x, accel_y, accel_z, accel_comp);
     fprintf(fp, "%.1f,%.1f,%.1f,%.3f,%.3f,%.3f,%.1f,", angle_x,angle_y,angle_z,mag_x, mag_y, mag_z,compass);
     fprintf(fp, "%d,%d,%d,%d,%d,%d," ,uv,omronReading, vInReading, vBlowerReading, omronDiff,gasG.getAmps());
-    fprintf(fp, "%d,%d,%d,%1.3f,%1.3f,", gasG.getVolts(), gasG.getCharge(),digital_pot_set, deltaMflow, deltaVflow);
+    fprintf(fp, "%d,%d,%d,%1.3f,%1.3f,\r\n", gasG.getVolts(), gasG.getCharge(),digital_pot_set, deltaMflow, deltaVflow);
     //fprintf(fp, "%.4f,%.4f,%06d,%06d,%f,%d,%f,\r\n",  gps.lat, gps.lon, (long)gps.date, (long)gps.utc, gpsspeed, gpssatellites,  gpsaltitude); // test and add in speed, etc that Josh added in to match the adafruit GPS
     fclose(fp);
     free(fp);
@@ -588,12 +588,13 @@
     
     RGB_LED.set_led(0,0,1);
     STtime.tm_sec = 10;    // 0-59
-    STtime.tm_min = 51;    // 0-59
-    STtime.tm_hour = 21;   // 0-23
-    STtime.tm_mday = 17;   // 1-31
-    STtime.tm_mon = 11;     // 0-11
-    STtime.tm_year = 115;  // year since 1900
+    STtime.tm_min = 30;    // 0-59
+    STtime.tm_hour = 9;   // 0-23
+    STtime.tm_mday = 22;   // 1-31
+    STtime.tm_mon = 2;     // 0-11
+    STtime.tm_year = 116;  // year since 1900
     time_t seconds = mktime(&STtime);
+    set_time(seconds); // Set RTC time to 16 December 2013 10:05:23 UTC
     wait(5);
 
 /*