Diff: main.cpp

Revision:

36:a0098306fc58

Parent:

35:26b0a9b55d82

Child:

37:7c4d7f206039

--- a/main.cpp	Sun Jan 07 13:32:54 2018 +0000
+++ b/main.cpp	Sun Jan 07 16:17:24 2018 +0000
@@ -1,8 +1,8 @@
 /*
 ELEC 351 Group T
 Team Members : Christopher Hills, Thomas Morris
-Current Verision 15
-Overiew: Working Tasks 1,2,4,5,6,7,8,10,11,12,13
+Current Verision 17
+Overiew: Working Tasks 1,2,3,5,6,7,8,9,10,11,12,13
 
 Last Revision: Added Mail Box to serial
 Todo:
@@ -20,8 +20,23 @@
     while(1)
     {
         Thread::wait(5000);//Waits 5 seconds
-        cout << "In Network Thread" << endl;
-        Networking();//Prints the network data   
+        cout << "In Network Thread" << endl;   
+        
+        time_t Time = Data_Active.get_time();
+        tm* Time_Pointer = localtime(&Time);
+        int temp_day = Time_Pointer->tm_mday;
+        int temp_month = (Time_Pointer->tm_mon+1);
+        int temp_year = (Time_Pointer->tm_year+1900);
+        
+        int temp_hours = Time_Pointer->tm_hour;
+        int temp_minute = Time_Pointer->tm_min;
+        
+        float temp_temperature = Data_Active.get_temperature();
+        float temp_pressure = Data_Active.get_pressure();
+        float temp_light = Data_Active.get_light();
+
+        
+       Networking(temp_day,temp_month,temp_year,temp_hours,temp_minute,temp_temperature,temp_pressure,temp_light);
     }
 }
 void LCD_Write_Year()