Diff: clock.cpp

Revision:

122:480c44b0e205

Parent:

121:ee02790d00b7

Child:

131:938ab88facae

--- a/clock.cpp	Fri May 08 04:15:23 2015 +0000
+++ b/clock.cpp	Mon May 11 15:16:36 2015 +0000
@@ -1,4 +1,4 @@
-#include "header_app_includes.h"
+#include "clock.h"
 
 time_t current_time = 0;
 
@@ -8,7 +8,7 @@
 
 Timer server_clock_timer;
 
-extern const char SERVER_IP[]; // definido em vz_protocol.h
+extern const char SERVER_IP[];
 
 int request_clock_to_server ( void )
 {
@@ -101,30 +101,19 @@
 int init_clock ( void )
 {   
     char server_ip [ 16 ];
-
-    FILE * fp = fopen ( "/qspi/serverip.txt", "r");
-    if ( fp == NULL)
+    
+    int server_ip_ret = get_clock_server_ip ( server_ip, sizeof ( server_ip ) - 1  );
+    
+    if ( server_ip < 0 )
     {
-        if ( debug_sip ) debug_msg("Failed to open /qspi/serverip.txt" );
-        strncpy ( server_ip, SERVER_IP, 20 );    
-    } else {
-        char tmp [ 16 ] = "\0";
-        int read = fread ( tmp, 1, 15, fp );
-        if ( read > 0 ){
-            for ( int i = 0; i < read; i++ ) 
-                if ( tmp [ i ] == '\n' || tmp[ i ] == '\r' ){
-                     tmp [ i ] = '\0';
-                    break;
-                }
-            strcpy ( server_ip, tmp );
-            if ( debug_sip ) debug_msg ("ip server%s( read %d chars ), valid %d", server_ip, read, strlen( server_ip )  );
-        }else{
-            if ( debug_sip ) debug_msg ("Failed to read /qspi/serverip.txt" );
-            strncpy ( server_ip, SERVER_IP, 20 );
-        }
+        set_clock_server_ip ( SERVER_IP );
+        
+        strncpy ( server_ip, SERVER_IP, sizeof ( server_ip ) - 1  );
+        
+        if ( debug_file ) debug_msg ("Load default clock_server_ip -- %s", server_ip );
     }
-    fclose ( fp );
-    server_ip [ 15 ] = '\0';
+    
+    server_ip [ sizeof ( server_ip ) - 1 ] = 0;
 
     int clock_server_set_address_ret = clock_server.set_address( server_ip, CLOCK_SERVER_PORT );
     
@@ -154,49 +143,6 @@
     return ( clock_sock_bind_ret );    
 }
 
-void print_clock ( uint8_t * buffer )
-{
-    if( buffer != NULL )
-    {
-        struct tm * result_tm;
-        if( sizeof( time_t ) != sizeof( long ) )
-        {
-            if ( debug_clock ) debug_msg("sizeof( time_t ) : %lu -- sizeof( long int ) : %lu\n", sizeof( time_t ), sizeof( long ) );
-        }
-                                   
-        if ( debug_clock ) debug_msg("current_time : %lu\t", current_time );
-                                                                                                                                        
-        if( current_time != 0 )
-        {
-            result_tm = localtime( ( const time_t *)&current_time );
-            if ( result_tm )
-            {
-                char formated_time[ 16 ];
-                
-                /* Correcao "manual" do (GMT -3:00) */
-                result_tm->tm_hour -= 3;
-                if ( result_tm->tm_hour < 0 ) result_tm->tm_hour = 24 + result_tm->tm_hour;
-                
-                size_t formated_nbytes = strftime( formated_time, sizeof( formated_time ), "%Y%m%d%H%M%S", result_tm );
-                
-                if ( debug_clock ) debug_msg("clock() : %s\n", formated_time );
-                
-                if( formated_nbytes != CLOCK_SYNC_SIZE ) debug_msg("( %lu )\n", formated_nbytes );
-                
-                for( register int i = 0; i < CLOCK_SYNC_SIZE; i++ ) buffer[ i ] = formated_time[ i ];
-            }
-                else
-            {
-                for( register int i = 0; i < CLOCK_SYNC_SIZE; i++ ) buffer[ i ] = 0xfa;
-            }
-        }
-            else
-        {
-            for( register int i = 0; i < CLOCK_SYNC_SIZE; i++ ) buffer[ i ] = 0xab;
-        }
-    }
-}
-
 int show_clock ( void )
 {   
     char buffer[ 512 ];
@@ -223,8 +169,6 @@
             size_t formated_nbytes = strftime( formated_time, sizeof( formated_time ), "%Y%m%d%H%M%S", result_tm );
             
             strncat ( buffer, formated_time, available_bytes );
-            
-            if( formated_nbytes != CLOCK_SYNC_SIZE ) debug_msg("( %lu )\n", formated_nbytes );
         }
     }
         else