Diff: merged_code.cpp

Revision:

10:9184e2fb5974

Parent:

9:7965c3bc3199

Child:

11:63f48533dc6f

Child:

12:0ab0a2578025

--- a/merged_code.cpp	Mon Mar 09 12:46:24 2015 +0000
+++ b/merged_code.cpp	Mon Mar 09 13:17:46 2015 +0000
@@ -943,7 +943,10 @@
     while(1) 
     {
         pc.printf("\r\n%d\t%d\r\n",hour,old_hour);
-        if (old_hour!=100 &&hour!=old_hour)
+        sampling();
+        store();
+        FTP_Fun();
+        if (old_hour!=100 && hour!=old_hour)
         {
             pc.printf("\r\nhour changed");
             if(ftp_connect())
@@ -954,14 +957,10 @@
             }
             downloadFTP();    // For FTPGET Function 
         }
+        pc.printf("\r\n Complete Done");
         old_hour=hour;
         sprintf(timestampname_old,timestampname);
         sprintf(timestamppath_old,timestamppath);
-        sampling();
-        store();
-        FTP_Fun();
-        pc.printf("\r\n Complete Done");
-        
         if(hour%2>0) 
         {
             if(minute>3 && minute<6)