Diff: main.cpp

Revision:

31:bb5fb28a77df

Parent:

30:8dfb6d8de53d

Child:

32:43041f5e27c4

--- a/main.cpp	Thu Sep 25 14:37:02 2014 +0000
+++ b/main.cpp	Thu Sep 25 19:34:46 2014 +0000
@@ -112,7 +112,7 @@
             data = __parse_cb_buffer__( &ext, &port, &type, buffer );
             
             if( data != NULL ){                
-                if( debug_alive == 1 ) debug_msg("Pkg from CBx :: %d -- Type :: %d", ext, type );
+                if( debug_alive == 1 && debug_cb_rx ) debug_msg("Pkg from CBx :: %d -- Type :: %d", ext, type );
                 if( type != __AUDIO__ ){
                     Call_Box * cb = __find_CB__( v_cb, ext );
                     if( cb != NULL ){
@@ -153,6 +153,9 @@
                 led3 = !led3;
                 CAB_LED = !CAB_LED;
                 
+                if( debug_cks ) debug_msg("PKG_CSK OK: %d :: PKG_CSK ERR: %d", pkg_cksok, pkg_ckserr );
+                
+                //<><><><><><><><><><> simulando cbx
                 if( count  == 4 ){
                     Call_Box * cb = new Call_Box( 854, 0x1011 );
                     v_cb->add( cb );
@@ -200,7 +203,7 @@
                 if( debug_main ) debug_msg("Request Invite received from Cbx %i", ext);
                 Call_Box * cb = __find_CB__( v_cb, ext );
                 if( cb == NULL ){
-                    debug_msg("Adding CBx :: %i", ext );
+                    if( debug_main ) debug_msg("Adding CBx :: %i", ext );
                     cb = new Call_Box( ext, port );
                     v_cb->add( cb );
                     set_status( cb->status, cb_idle );
@@ -243,14 +246,14 @@
                             __send_to_cb__( __build_cb_package__( ext, port, __INVITE__, 
                                 ( char * )data, cb->get_msg_id(), __CB_BUFFER_SIZE__ - __VZ_HEADER_OFFSET__, write_buffer ) );
                             set_status( cb->sip->status, sip_idle);
-                            debug_msg( "-- Trying -- without TS -- %s ", write_buffer );
+                            if( debug_main ) debug_msg( "-- Trying -- without TS -- %s ", write_buffer );
                         }else{
                             set_status(cb->status,cb_busy);
                             data[ __TIMESLICE_PLACE__ ] = cb->get_timeslice();
                             __send_to_cb__( __build_cb_package__( ext, port, __INVITE__, 
                                 ( char * )data, cb->get_msg_id(), __CB_BUFFER_SIZE__ - __VZ_HEADER_OFFSET__, write_buffer ) );
                             
-                            debug_msg(" -- %d on %d -- ", cb->get_ext(), data[ __TIMESLICE_PLACE__ ] );
+                            if( debug_main ) debug_msg(" -- %d on %d -- ", cb->get_ext(), data[ __TIMESLICE_PLACE__ ] );
                              
                             cb->set_msg_id( ( ( cb->get_msg_id() ) + 1 ) & ( BIT7 ^ 0xff ) );
                             VZ_call * call = cb->invite();
@@ -259,19 +262,19 @@
                                 v_call->add( call );
                                 set_status(cb->status,cb_on_call);
                                 
-                                debug_msg(" -- %d on %d -- ", cb->get_ext(), data[ __TIMESLICE_PLACE__ ] );
+                                if( debug_main ) debug_msg(" -- %d on %d -- ", cb->get_ext(), data[ __TIMESLICE_PLACE__ ] );
                                 __send_to_cb__( __build_cb_package__( ext, port, __INVITE__, 
                                     ( char * )data, cb->get_msg_id(), __CB_BUFFER_SIZE__ - __VZ_HEADER_OFFSET__, write_buffer ) );
-                                debug_msg( "-- Trying -- accepting call request --" );
+                                if( debug_main ) debug_msg( "-- Trying -- accepting call request --" );
                             }else{
                                 set_status( cb->status,cb_idle);
                                 ts->return_timeslice( cb->get_timeslice() );
                                 cb->set_timeslice( 0x00 );
                                 data[ __TIMESLICE_PLACE__ ] = 0x00;
-                                debug_msg(" -- %d on %d -- ", cb->get_ext(), data[ __TIMESLICE_PLACE__ ] );
+                                if( debug_main ) debug_msg(" -- %d on %d -- ", cb->get_ext(), data[ __TIMESLICE_PLACE__ ] );
                                 __send_to_cb__( __build_cb_package__( ext, port, __CB_BYE__, 
                                     ( char * )data, cb->get_msg_id(), __CB_BUFFER_SIZE__ - __VZ_HEADER_OFFSET__, write_buffer ) );
-                                debug_msg( "-- Trying -- denying call request --" );
+                                if( debug_main ) debug_msg( "-- Trying -- denying call request --" );
                                 set_status( cb->sip->status, sip_idle);
                             }
                         }
@@ -311,10 +314,7 @@
                     ( char * )data, data[ 0 ], __CB_BUFFER_SIZE__ - __VZ_HEADER_OFFSET__, write_buffer ) );
                 }break;
             case __TELEMETRY__ : {
-                    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");
+                    build_telemetry_report( ext, port, ( char *)data );
                 }break;
             case __AUDIO__ : {
                 Call_Box * cb;
@@ -322,7 +322,6 @@
                 cb = NULL;
                 call = __find_Call__( v_call, ext );
                 if( call != NULL ){
-                    //char * pkg = call->build_eth_package( data );
                     char * pkg = call->build_eth_package( data + 2 ); 
                     call->send_message( pkg );
                     cb = __find_CB__( v_cb, ext );