Diff: utils.cpp

Revision:

28:94aec56c6329

Parent:

27:98f824719d1c

Child:

29:7246460b73f8

--- a/utils.cpp	Mon Sep 22 21:15:07 2014 +0000
+++ b/utils.cpp	Tue Sep 23 18:28:37 2014 +0000
@@ -45,15 +45,16 @@
     char buff_ip[ 16 ];
     char buff_msk[ 16 ];
     char buff_gtw[ 16 ];
+    pc.printf("\n\r");
     FILE *fp = fopen( "/qspi/myip.txt", "r");
     if( fp == NULL ){
-        pc.printf("Failed to open /qspi/myip.txt\n\r" );
+        debug_msg("Failed to open /qspi/myip.txt" );
         strncpy( buff_ip, __MY_IP__, 20 );    
     }else{
         if( fread( buff_ip, 1, 512, fp ) > 0 ){
             debug_msg("Eth ip %s", buff_ip );
         }else{
-            pc.printf("Failed to read /qspi/myip.txt\n\r" );
+            debug_msg("Failed to read /qspi/myip.txt" );
             strncpy( buff_ip, __MY_IP__, 20 );
         }
     }
@@ -63,14 +64,14 @@
     
     fp = fopen( "/qspi/mymask.txt", "r");
     if( fp == NULL ){
-        pc.printf("Failed to open /qspi/mymask.txt \n\r" );
-        strncpy( buff_msk, __MY_IP__, 20 );    
+        debug_msg("Failed to open /qspi/mymask.txt" );
+        strncpy( buff_msk, __MY_MSK__, 20 );    
     }else{
         if( fread( buff_msk, 1, 512, fp ) > 0 ){
             debug_msg("mascara de rede Eth %s", buff_msk );
         }else{
-            pc.printf("Failed to read /qspi/mymask.txt\n\r" );
-            strncpy( buff_msk, __MY_IP__, 20 );
+            debug_msg("Failed to read /qspi/mymask.txt" );
+            strncpy( buff_msk, __MY_MSK__, 20 );
         }
     }
     fclose( fp );
@@ -79,14 +80,14 @@
     
     fp = fopen( "/qspi/mygate.txt", "r");
     if( fp == NULL ){
-        pc.printf("Failed to open /qspi/mygate.txt \n\r" );
-        strncpy( buff_gtw, __MY_IP__, 20 );    
+        debug_msg("Failed to open /qspi/mygate.txt" );
+        strncpy( buff_gtw, __MY_GTW__, 20 );    
     }else{
         if( fread( buff_gtw, 1, 512, fp ) > 0 ){
             debug_msg("Ip Gateway Eth %s", buff_gtw );
         }else{
-            pc.printf("Failed to read /qspi/mygate.txt\n\r" );
-            strncpy( buff_gtw, __MY_IP__, 20 );
+            debug_msg("Failed to read /qspi/mygate.txt" );
+            strncpy( buff_gtw, __MY_GTW__, 20 );
         }
     }
     fclose( fp );
@@ -129,18 +130,10 @@
                 }else{
               //      debug_msg("Ping on %d", cb->get_ext() );
                     
-                    cb->set_msg_id( ( ( cb->get_msg_id() ) + 1 ) & ( BIT7 ^ 0xff ) );
-                    
-                    debug_msg("");
-                    
+                    cb->set_msg_id( ( ( cb->get_msg_id() ) + 1 ) & ( BIT7 ^ 0xff ) );                
                     __send_to_cb__( __build_cb_package__( cb->get_ext(), cb->get_port(), __REGISTRY__, 
                         ( char * )data, cb->get_msg_id(), __CB_BUFFER_SIZE__ - __VZ_HEADER_OFFSET__, write_buffer ) );
-                    
-                    debug_msg("");
-                    
                     cb->registry();
-                    
-                    debug_msg("");
                 }
             }
         }