Modularizando o src
Dependencies: EALib EthernetInterface_vz mbed-rtos mbed
Fork of header_main_colinas_V0-20-09-14 by
Diff: clock.cpp
- Revision:
- 132:05cd37f7e007
- Parent:
- 131:938ab88facae
- Child:
- 135:2f4290590e51
diff -r 938ab88facae -r 05cd37f7e007 clock.cpp --- a/clock.cpp Tue Jul 21 20:03:35 2015 +0000 +++ b/clock.cpp Tue Sep 01 17:21:11 2015 +0000 @@ -8,27 +8,30 @@ Timer server_clock_timer; -extern const char SERVER_IP[]; - -int request_clock_to_server ( void ) +int +request_clock_to_server ( void ) { - char clock_msg[ TIME_MSG_SIZE ]; + char clock_msg [ TIME_MSG_SIZE ]; for ( register uint8_t i = 0; i < TIME_MSG_SIZE; i++ ) clock_msg [ i ] = 0x00; clock_msg [ 0 ] = 0x23; - int send = clock_sock.sendTo ( clock_server, clock_msg, sizeof ( clock_msg ) ); + int send = clock_sock.sendTo ( clock_server, clock_msg, TIME_MSG_SIZE ); - if ( debug_clock ) debug_msg("::%d::%s::%s::%d::", send, clock_msg, clock_server.get_address (), clock_server.get_port () ); + if ( debug_clock ) vz_debug ("::%d::%s::%s::%d::", send, clock_msg, clock_server.get_address (), clock_server.get_port () ); - if ( send != sizeof ( clock_msg ) ) + if ( send not_eq TIME_MSG_SIZE ) { - if( debug_reconnect ) debug_msg("Reconnect clock request" ); - clock_sock_reconnect (); - miss_clock_send_pkg++; + if ( debug_reconnect ) vz_debug ("Reconnect clock request" ); + int clock_sock_reconnect_ret = clock_sock_reconnect (); + + if ( debug_reconnect ) vz_debug ("Valor de retorno no reconnect :: %d", clock_sock_reconnect_ret ); + + miss_clock_send_pkg ++; } - if ( debug_clock ) debug_msg("send :: %d", send ); + + if ( debug_clock ) vz_debug ("send :: %d", send ); return ( send ); } @@ -58,20 +61,20 @@ if( time_msg_rcv == -1 ) { - if( debug_reconnect ) send_msg("Reconnect clock socket"); + if( debug_reconnect ) vz_printf ("Reconnect clock socket"); clock_sock_reconnect (); } else { if ( time_msg [ 0 ] != 0x24 ) { - debug_msg("Error: time_msg [ 0 ] != 0x24"); + vz_debug ("Error: time_msg [ 0 ] != 0x24"); return time_msg [ 0 ]; } else if ( time_msg [ 1 ] == 0x00 ) { - debug_msg("Error: time_msg [ 0 ] == 0x00"); + vz_debug ("Error: time_msg [ 0 ] == 0x00"); return time_msg [ 1 ]; } else if ( time_msg [ 1 ] > 0x0f ) { - debug_msg("Error: time_msg [ 0 ] > 0x0f"); + vz_debug ("Error: time_msg [ 0 ] > 0x0f"); return time_msg [ 1 ]; } } @@ -93,7 +96,7 @@ if ( diff_time > 2 ) current_time = local_current_time; - if ( debug_clock ) debug_msg("Clock.rcv ( %d ), diff [ %d ] ", local_current_time, diff_time ); + if ( debug_clock ) vz_debug ("Clock.rcv ( %d ), diff [ %d ] ", local_current_time, diff_time ); return ( local_current_time - current_time ); } @@ -102,43 +105,33 @@ { char server_ip [ 16 ]; - int server_ip_ret = get_clock_server_ip ( server_ip, sizeof ( server_ip ) - 1 ); + cm -> get_clock_server_ip ( server_ip ); + + int clock_server_set_address_ret = clock_server.set_address ( server_ip, CLOCK_SERVER_PORT ); - if ( server_ip < 0 ) - { - 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 ); - } + if ( debug_clock ) vz_debug ("clock_server_set_address_ret :: %d", clock_server_set_address_ret ); - server_ip [ sizeof ( server_ip ) - 1 ] = 0; - - int clock_server_set_address_ret = clock_server.set_address( server_ip, CLOCK_SERVER_PORT ); + int clock_sock_bind_ret = clock_sock.bind ( CLOCK_HEADER_PORT ); - if ( debug_clock ) debug_msg("clock_server_set_address_ret :: %d", clock_server_set_address_ret ); + clock_sock.set_blocking ( false, 0 ); - clock_sock.set_blocking( false, 0 ); - - int clock_sock_bind_ret = clock_sock.bind( CLOCK_HEADER_PORT ); + if ( debug_clock ) vz_debug ("clock_sock_bind_ret ::%d", clock_sock_bind_ret ); - if ( debug_clock ) debug_msg("clock_sock_bind_ret ::%d", clock_sock_bind_ret ); - - server_clock_timer.start(); + server_clock_timer.start (); request_clock_to_server (); return ( clock_server_set_address_ret | clock_sock_bind_ret ); } -int clock_sock_reconnect ( void ) +int +clock_sock_reconnect ( void ) { clock_sock.close (); - clock_sock.set_blocking ( false, 0 ); + int clock_sock_bind_ret = clock_sock.bind ( CLOCK_HEADER_PORT ); - int clock_sock_bind_ret = clock_sock.bind ( CLOCK_HEADER_PORT ); + clock_sock.set_blocking ( false, 0 ); return ( clock_sock_bind_ret ); } @@ -149,7 +142,7 @@ struct tm * result_tm; if ( sizeof( time_t ) != sizeof( long ) ) { - send_msg("sizeof( time_t ) : %lu -- sizeof( long int ) : %lu\n", sizeof( time_t ), sizeof( long ) ); + vz_printf ("sizeof( time_t ) : %lu -- sizeof( long int ) : %lu\n", sizeof( time_t ), sizeof( long ) ); } int filled = snprintf( buffer, 512, "current_time : %lu\tclock() : ", current_time ); @@ -176,7 +169,7 @@ strncat ( buffer, "???", available_bytes ); } - send_msg( "%s", buffer ); + vz_printf ( "%s", buffer ); return ( strlen ( buffer ) ); } \ No newline at end of file