Diff: main.cpp

Revision:

28:94aec56c6329

Parent:

27:98f824719d1c

Child:

29:7246460b73f8

diff -r 98f824719d1c -r 94aec56c6329 main.cpp
--- a/main.cpp	Mon Sep 22 21:15:07 2014 +0000
+++ b/main.cpp	Tue Sep 23 18:28:37 2014 +0000
@@ -24,8 +24,6 @@
 */
 volatile uint8_t status = 0x00;
 
-bool debug_bool = true;
-
 int main(){
     start_cpld();
     config_lpc();
@@ -173,11 +171,13 @@
                 led3 = !led3;
                 CAB_LED = !CAB_LED;
                 
-                if( count  == 8 ){
-                    Call_Box * cb = new Call_Box( ext, port );
-                    cb->registry();
+                if( test_debug ){
+                    if( count  == 8 ){
+                        Call_Box * cb = new Call_Box( ext, port );
+                        cb->registry();
+                    }
+                    count++;
                 }
-                count++;
             }
 //----------------------
         switch( type ){
@@ -325,7 +325,10 @@
                     ( char * )data, data[ 0 ], __CB_BUFFER_SIZE__ - __VZ_HEADER_OFFSET__, write_buffer ) );
                 }break;
             case __TELEMETRY__ : {
-                    debug_msg("Leitura da bateria :: ( Id : %x, MSB : %x, LSB : %x )", data[ 0 ], data[ 1 ], data[ 2 ] );
+                    pc.printf("Telemetry pkg from %i\n\r", ext );
+                    for( register int i = 0; i < __TELEMETRY_SIZE__; i++ )
+                        pc.printf("%x ", data[ i ]);
+                    pc.printf("\n\r");
                 }break;
             case __AUDIO__ : {
                 Call_Box * cb;
@@ -333,16 +336,12 @@
                 cb = NULL;
                 call = __find_Call__( v_call, ext );
                 if( call != NULL ){
-                    //debug_( 240, data );
-                    //debug_pkg( 242, data );
-                    //char * pkg = call->build_eth_package( oitocentos );
-                    //char * pkg = call->build_eth_package( data );
-                    char * pkg = call->build_eth_package( data + 2 );
+                    char * pkg = call->build_eth_package( data );
                     call->send_message( pkg );
                     cb = __find_CB__( v_cb, ext );
                     if( cb != NULL ) cb->reset_elapsed_time();
                 }else{
-                    debug_msg("Nao encontrado CBx :: %d -- Type :: %d", ext, type );
+                    debug_msg("received missed package  from CBx :: %i -- Type :: %i", ext, type );
                 }
             }break;
         }// fim switch
@@ -357,7 +356,7 @@
                 
                 if( cb != NULL ){
                     cb_port = cb->get_port();
-                }else debug_msg("Nao encontrado CBx :: %d -- Type :: %d", ext, type );
+                }else debug_msg("received missed package  from CBx :: %i -- Type :: %i", ext, type );
                                 
                 uint8_t * pkg2cb = __build_cb_package__( call->get_cb_ext(), cb_port, __AUDIO__, 
                     tmp, __AUDIO__, length, write_buffer );
@@ -366,7 +365,7 @@
             }
         }
         ///debug_msg("");
-        registry_aging( v_cb, buffer, write_buffer );
+        if( v_call->size() == 0 ) registry_aging( v_cb, buffer, write_buffer );
         
         int ret = sip_manager( v_cb, v_call, write_buffer );
         if( ret > 0x00 ){