Diff: utils.cpp

Revision:

31:bb5fb28a77df

Parent:

30:8dfb6d8de53d

Child:

32:43041f5e27c4

--- a/utils.cpp	Thu Sep 25 14:37:02 2014 +0000
+++ b/utils.cpp	Thu Sep 25 19:34:46 2014 +0000
@@ -49,13 +49,13 @@
     pc.printf("\n\r");
     FILE *fp = fopen( "/qspi/myip.txt", "r");
     if( fp == NULL ){
-        debug_msg("Failed to open /qspi/myip.txt" );
+        if( debug_file ) 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 );
+            if( debug_file ) debug_msg("Eth ip %s", buff_ip );
         }else{
-            debug_msg("Failed to read /qspi/myip.txt" );
+            if( debug_file ) if( debug_file ) debug_msg("Failed to read /qspi/myip.txt" );
             strncpy( buff_ip, __MY_IP__, 20 );
         }
     }
@@ -65,13 +65,13 @@
     
     fp = fopen( "/qspi/mymask.txt", "r");
     if( fp == NULL ){
-        debug_msg("Failed to open /qspi/mymask.txt" );
+        if( debug_file ) 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 );
+            if( debug_file ) debug_msg("mascara de rede Eth %s", buff_msk );
         }else{
-            debug_msg("Failed to read /qspi/mymask.txt" );
+            if( debug_file ) debug_msg("Failed to read /qspi/mymask.txt" );
             strncpy( buff_msk, __MY_MSK__, 20 );
         }
     }
@@ -81,13 +81,13 @@
     
     fp = fopen( "/qspi/mygate.txt", "r");
     if( fp == NULL ){
-        debug_msg("Failed to open /qspi/mygate.txt" );
+        if( debug_file ) 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 );
+            if( debug_file ) debug_msg("Ip Gateway Eth %s", buff_gtw );
         }else{
-            debug_msg("Failed to read /qspi/mygate.txt" );
+            if( debug_file ) debug_msg("Failed to read /qspi/mygate.txt" );
             strncpy( buff_gtw, __MY_GTW__, 20 );
         }
     }
@@ -129,7 +129,7 @@
                     delete( cb );
                     break;
                 }else{
-                    debug_msg("Ping on %d", cb->get_ext() );      
+                    if( debug_alive ) debug_msg("Ping Cbx %d", cb->get_ext() );      
                     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 ) );
@@ -138,47 +138,6 @@
             }
         }
     }
-    /*
-    Call_Box * cb = NULL;
-    if( v_cb && data && write_buffer ){
-        bool remove_slave = false;
-        int slave = 0x00;
-        int tam = v_cb->size();
-        for( register int i = 0; i < v_cb->size(); i++ ){
-            cb = (Call_Box * )v_cb->get_element( i );
-            if( cb->get_ext() % 2 ) continue;
-            if( cb->is_timeout() ){
-                if( cb->reconfigure_timeout() == 0x00 ){
-                    debug_msg("( ext %d removed", cb->get_ext() );
-                    cb->unregistry();
-                    slave = cb->get_ext() + 1;
-                    remove_slave = true;
-                    v_cb->remove_element( i );
-                    delete( cb );
-                    break;
-                }else{
-                    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 ) );
-                    cb->registry();
-                }
-            }
-        }
-        if( remove_slave ){                
-            for( register int i = 0; i < v_cb->size(); i++ ){
-                cb = (Call_Box * )v_cb->get_element( i );
-                if( cb->get_ext() == slave ){
-                    debug_msg("( ext %d removed", cb->get_ext() );
-                    cb->unregistry();
-                    v_cb->remove_element( i );
-                    delete( cb );
-                }
-            }
-        }
-        if( tam != v_cb->size() ) debug_msg("%d ---> %d", tam, v_cb->size() );
-    }
-    */
-    //debug_msg("");
 }
 
 int sip_manager( Vector * v_cb, Vector * v_call, uint8_t * write_buffer ){
@@ -233,9 +192,10 @@
 }
 
 void build_telemetry_report( int ext, int port, char * data ){
-    // construir o pacote de telemetria aqui
-    // decidir se isso sera escrito em disco e de tempos em tempos enviado para o servidor ... 
-    // ou se sera enviado toda vez que determinado cb se registrar ...    
+    pc.printf("Telemetry pkg from %i ::\n\r", ext );
+    for( register int i = 0; i < __TELEMETRY_SIZE__; i++ )
+        pc.printf("%3i ", data[ i ] );
+    pc.printf("\n\r");
 }
 
 void __send_to_cb__( uint8_t * buffer ){