Diff: fw_handler.cpp

Revision:

105:a930035b6556

Parent:

104:62646ef786a3

Child:

109:a5b8264ffbbc

--- a/fw_handler.cpp	Wed Feb 25 18:44:11 2015 +0000
+++ b/fw_handler.cpp	Tue Mar 10 18:10:57 2015 +0000
@@ -10,13 +10,10 @@
     int fw_port = 0;
 
     FILE *fp = fopen( "/qspi/fw_ip.txt", "r");
-    //debug_msg("");
     if( fp == NULL ){
-        if( debug_file | debug_reconnect ) debug_msg("Failed to open /qspi/fw_ip.txt" );
+        if( debug_file | debug_reconnect ) send_msg("Failed to open /qspi/fw_ip.txt" );
         strncpy( buff_ip, __FW_SERVER_IP__, 20 );
-        //debug_msg("");
     }else{
-        //debug_msg("");
         int read = fread( buff_ip, 1, 512, fp );
         if( read > 0 ){
             for( int i = 0; i < read; i++ ) 
@@ -24,22 +21,18 @@
                     buff_ip[ i ] = '\0';
                     break;
                 }
-            if( debug_file | debug_reconnect ) debug_msg("fw server ip %s", buff_ip );
-            //debug_msg("");
+            if( debug_file | debug_reconnect ) send_msg("fw server ip %s", buff_ip );
         }else{
-            if( debug_file | debug_reconnect ) debug_msg("Failed to open /qspi/fw_ip.txt" );
+            if( debug_file | debug_reconnect ) send_msg("Failed to open /qspi/fw_ip.txt" );
             strncpy( buff_ip, __FW_SERVER_IP__, 20 );
-            //debug_msg("");
         }
     }
     if( fp != NULL ) fclose( fp );
-    //debug_msg("");    
     fp = fopen( "/qspi/fw_port.txt", "r");
     if( fp == NULL ) {
-        if( debug_fw | debug_reconnect ) debug_msg("Failed to open /qspi/fw_port.txt" );
+        if( debug_fw | debug_reconnect ) send_msg("Failed to open /qspi/fw_port.txt" );
         fw_port = __FW_SERVER_PORT__;
     } else {
-        //debug_msg(""); 
         if( fread( (void *)buff_port, 1, 32, fp ) > 0 ) {
             fw_port = atoi( buff_port );
             if( debug_fw | debug_reconnect ) send_msg( "fw server port %d", fw_port );
@@ -50,30 +43,30 @@
     }
     if( fp != NULL ) fclose( fp );  
     int addr = fw_server.set_address( buff_ip , fw_port );
-    if( debug_fw | debug_reconnect ) send_msg(" Valor de retorno set_address -- %d ", addr );
+    if( debug_fw | debug_reconnect ) send_msg("Valor de retorno set_address -- %d ", addr );
     fw_sock.set_blocking( false, 0 );
     int bind = fw_sock.bind( __FW_HEADER_PORT__ );
-    if( debug_fw | debug_reconnect ) send_msg(" Valor de retorno bind -- %d ", bind );
+    if( debug_fw | debug_reconnect ) send_msg("Valor de retorno bind -- %d ", bind );
 }
 
 void re_start_fw( void ){
     int close = fw_sock.close();
-    if( debug_fw | debug_reconnect ) send_msg(" Valor de retorno close-- %d ", close );
+    if( debug_fw | debug_reconnect ) send_msg("Valor de retorno close -- %d ", close );
     
     init_fw_handler();
 }
 
 void fw_cbx_pkg( int ext, int port, char * data ){
     static uint8_t fw_cbx_pkg_id = 0x00;
-    data[ __CB_BUFFER_SIZE__ - 1 ] = fw_cbx_pkg_id++;
+    data[ CB_BUFFER_SIZE - 1 ] = fw_cbx_pkg_id++;
      
-    int send = fw_sock.sendTo( fw_server, data, __CB_BUFFER_SIZE__ );
+    int send = fw_sock.sendTo( fw_server, data, CB_BUFFER_SIZE );
     
-    if( send != __CB_BUFFER_SIZE__ )
+    if( send != CB_BUFFER_SIZE )
     {
         if( debug_reconnect )
         {
-            send_msg("Reconnect FW");
+            send_msg("Reconnect FW - %d", send );
         }
         
         miss_fw_send_pkg++;