Diff: main.cpp

Revision:

7:6becc29457ce

Parent:

6:61b76e7dc5b7

Child:

8:28f8162d2929

--- a/main.cpp	Wed Mar 16 22:06:43 2016 +0000
+++ b/main.cpp	Thu Mar 31 17:32:01 2016 +0000
@@ -3,8 +3,7 @@
 #include "TEMPSensor.h"
 #include "SDFileSystem.h"
 #include "SDSave.h"
-
-
+#include "SolarPanel.h"
 
 Timer t;
 DigitalOut ledBlue(LED_BLUE);
@@ -28,8 +27,8 @@
     while (t.read()<60) {
         if (t.read()>(lastTime+interval))  {
           lastTime=t.read();
-          pc.printf("t = %.2f \t outside = %d \t inside = %d\t panel = %d\r\n",lastTime,get_outsideTemp(),get_insideTemp(),get_panelTemp());//prints titles and data of Temp readings
-          writeData_testTEMP(lastTime,get_outsideTemp(),get_insideTemp(),get_panelTemp());//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) \n\r" ,get_outsideTemp(),get_insideTemp(),get_panelTemp(),get_solar());//prints titles and data of Temp readings
+          writeData(lastTime,get_outsideTemp(),get_insideTemp(),get_panelTemp(),get_solar());//send data to writeData in SDsave.cpp
           //we will get all rgb readings through an array, with the corresponding integers going in order red, green, blue
         }
     }