Diff: main.cpp

Revision:

9:9690da23e8d7

Parent:

8:28f8162d2929

Child:

10:478e0eb37b0d

--- a/main.cpp	Thu Mar 31 17:53:11 2016 +0000
+++ b/main.cpp	Sun Apr 03 21:51:02 2016 +0000
@@ -5,6 +5,7 @@
 #include "SDSave.h"
 #include "SolarPanel.h"
 #include "UVSensor.h"
+#include "RGBSensor.h"
 
 Timer t;
 DigitalOut ledBlue(LED_BLUE);
@@ -23,13 +24,15 @@
         return -1; //end program with error status
     }
     pc.printf("The SD card is mounted\n\r");
+    
+    uint16_t rgb[3];
     ledRed = 1;
-    createDataFile_testTEMP();
+    createDataFile();
     while (t.read()<60) {
         if (t.read()>(lastTime+interval))  {
           lastTime=t.read();
-          pc.printf("temp ouside = %.2f (c) \t inside = %.2f (c) \t on panel = %.2f (c) \t solar volage = %.2f (V) \t UV light =%.2f \n\r" ,get_outsideTemp(),get_insideTemp(),get_panelTemp(),get_solar(),get_UV());//prints titles and data of Temp readings
-          writeData(lastTime,get_outsideTemp(),get_insideTemp(),get_panelTemp(),get_solar(),get_UV());//send data to writeData in SDsave.cpp
+          pc.printf("temp ouside = %.2f (c) \t inside = %.2f (c) \t on panel = %.2f (c) \t solar volage = %.2f (V) \t UV light =%.2f RGB Values:  red = %d \t green = %d\t blue = %d\r\n" ,get_outsideTemp(),get_insideTemp(),get_panelTemp(),get_solar(),get_UV(),rgb[0],rgb[1],rgb[2]);//prints titles and data of Temp readings
+          writeData(lastTime,get_outsideTemp(),get_insideTemp(),get_panelTemp(),get_solar(),get_UV(),rgb[0],rgb[1],rgb[2]);//send data to writeData in SDsave.cpp
           
         }
     }