Diff: main.cpp

Revision:

18:194a606ccd47

Parent:

17:37d883f40c3d

Child:

19:54bc302a82ea

diff -r 37d883f40c3d -r 194a606ccd47 main.cpp
--- a/main.cpp	Sun Dec 24 15:43:08 2017 +0000
+++ b/main.cpp	Wed Dec 27 21:23:47 2017 +0000
@@ -86,6 +86,7 @@
         msg_network.set_light(Rec_Data_Network->get_light());                   //Copy light from mailbox to temporary instance   
         mail_box.free(Rec_Data_Network);                                        //Free space in the mailbox (delete earliest sample taken)
     
+        networktest();
         //NETWORK_Print();     //Runs the network
     }                                                
 }
@@ -156,9 +157,9 @@
             else if(mode == 1)//Print the Time to the LCD
             {
                 time_t msel_time = msg_lcd.get_time();                                  //Declare local variable for time
-                strftime(scom_time_buffer, 32, "%I:%M %p\t", localtime(&msel_time));     //Format time as a string
+                strftime(scom_time_buffer, 32, "%I:%M %p", localtime(&msel_time));     //Format time as a string
                 lcd.cls();                                                              //Write new data to LCD (not fast!)
-                lcd.printf("Current Time:%s", buffer);
+                lcd.printf("Current Time:%s", scom_time_buffer);
             }
             else
             {
@@ -284,7 +285,7 @@
     t1.start(Sample);
     t2.start(Serial_Comms);
     t5.start(ModeSelection);
-    //t6.start(Network);
+    t6.start(Network);
     //Main thread ID
     
     idMain = osThreadGetId();   //CMSIS RTOS call