Diff: src/main.cpp

Revision:

60:96e17fb215a6

Parent:

59:c68c5bc9d077

Child:

65:be025ac18fb5

diff -r c68c5bc9d077 -r 96e17fb215a6 src/main.cpp
--- a/src/main.cpp	Wed Sep 14 22:26:43 2016 +0000
+++ b/src/main.cpp	Thu Sep 15 20:38:30 2016 +0000
@@ -61,7 +61,7 @@
     int iyr=0, imo=0, idy=0, ihr=0, imn=0, isc=0;
 
     rtc_get_time(&iyr, &imo, &idy, &ihr, &imn, &isc);
-    
+
     printf("\n\n\r\nWelcome to Project: ICE v0.0.35\n");
     printf("\rThe Intelligent Connected Experience\n");
     printf("\rCopyright 2016 Nalco Water, an Ecolab Company\n");
@@ -72,7 +72,7 @@
     printf("\r\t   | |   | |      |  __|  \n");
     printf("\r\t  _| |_  | |____  | |____ \n");
     printf("\r\t |_____|  \\_____| |______|\n");
-    
+
     printf("\r\nCurrent time is: %04d-%02d-%02d %02d:%02d:%02d\r\n", iyr, imo, idy, ihr, imn, isc);
 
     printf("\r\n\r\n\r\r\n");
@@ -88,15 +88,24 @@
 int main( void )
 {
     mDot *dot;
-    
-    // singleton object instatiation 
+    struct tm rtc_time;
+    time_t curr_sec;
+    int year=0;
+
+    // singleton object instatiation
     GLOBAL_mdot = dot = mDot::getInstance();
     mDotRadioInit( dot );
-    
+
     i2c = &i2c_instance;
-    
+
     rtc_init();
 
+    rtc_get_time(&year, &rtc_time.tm_mon, &rtc_time.tm_mday, &rtc_time.tm_hour, &rtc_time.tm_min, &rtc_time.tm_sec);
+    rtc_time.tm_mon = rtc_time.tm_mon - 1;
+    rtc_time.tm_year = year - 1900;
+    curr_sec =  mktime( &rtc_time );
+    set_time(curr_sec);
+
     // for signaling from the configuration handler
     mainThreadId = osThreadGetId();
 
@@ -105,8 +114,8 @@
 
     // start the configuration handler
     Thread configHandler_thread(ConfigurationHandler, NULL, osPriorityNormal, 3072, NULL);
-    Thread outputTask_thread(OutputTask, NULL, osPriorityNormal, 3072, NULL); 
-    Thread controlTask_thread(ControlTask); 
+    Thread outputTask_thread(OutputTask, NULL, osPriorityNormal, 3072, NULL);
+    Thread controlTask_thread(ControlTask);
 
     // wait for the configuration handler to signal us
     osSignalWait(sig_continue, osWaitForever);
@@ -117,8 +126,8 @@
     Thread modbusMaster_thread(ModbusMaster, NULL, osPriorityHigh, 10000, NULL);
     Thread BLE_thread(BLEDataHandler);
     Thread CDH_thread(CloudDataHandler, NULL, osPriorityNormal, 8000, NULL);
-    
-    // assign globals 
+
+    // assign globals
     GLOBAL_analyticsLogger_thread = &analyticsLoggerThread;
     GLOBAL_modbusMaster_thread = &modbusMaster_thread;
     GLOBAL_BLE_thread = & BLE_thread;
@@ -136,7 +145,7 @@
     printf("\r\n");
     Thread::wait(1000);
     printf("\r\n");
-    
+
     // start the command shell
     ntshell_execute(&ntshell, func_read, func_write, func_cb_ntshell);
 }
\ No newline at end of file