Modularizando o src
Dependencies: EALib EthernetInterface_vz mbed-rtos mbed
Fork of header_main_colinas_V0-20-09-14 by
Diff: call_box_manager.cpp
- Revision:
- 92:92df17f538a8
- Parent:
- 89:0fe315117b00
- Child:
- 104:62646ef786a3
diff -r c2a86b1f8aaa -r 92df17f538a8 call_box_manager.cpp --- a/call_box_manager.cpp Thu Jan 08 23:44:08 2015 +0000 +++ b/call_box_manager.cpp Sat Jan 10 16:35:11 2015 +0000 @@ -20,7 +20,8 @@ if( cb != NULL ){ timer_refresh.reset(); - cb->set_msg_id( ( cb->get_msg_id() + 1 ) & ( ~BIT7 ) ); + //cb->set_msg_id( ( cb->get_msg_id() + 1 ) & ( ~BIT7 ) ); + cb->set_msg_id( ( cb->get_msg_id() + 1 ) & ~BIT7 ); send2callboxes( __build_cb_package__( cb->get_ext(), cb->get_port(), __REGISTRY__, ( char * )data, cb->get_msg_id(), __CB_BUFFER_SIZE__ - __VZ_HEADER_OFFSET__, write_buffer ) ); @@ -41,7 +42,8 @@ if( cb_master != NULL && cb_master->status != cb_idle ) return( 0x20 ); } - cb->set_msg_id( ( cb->get_msg_id() + 1 ) & ( ~BIT7 ) ); + //cb->set_msg_id( ( cb->get_msg_id() + 1 ) & ( ~BIT7 ) ); + cb->set_msg_id( ( cb->get_msg_id() + 1 ) & ~BIT7 ); send2callboxes( __build_cb_package__( cb->get_ext(), cb->get_port(), __REGISTRY__, ( char * )data, cb->get_msg_id(), __CB_BUFFER_SIZE__ - __VZ_HEADER_OFFSET__, write_buffer ) ); @@ -96,13 +98,15 @@ // testa se eh o master if( ( ext_list[ i ] % 2 ) == 0 ){ //testa se o slave nao esta registrado + //FIXME resolver o que acontece com o ultimo carinha == master, provavelmente fazendo um || ( i == size ) if( ( ( i + 1 ) < size ) && ( ext_list[ i + 1 ] != ( ext_list[ i ] + 1 ) ) || ( size == 1 ) ){ if( debug_wake ) debug_msg("Mestre %d encontrado sem slave %d", ext_list[ i ], ext_list[ i ] + 1 ); if( once ){ strcpy( ( char * )data, "ping\r\r\r\n" ); Call_Box * cb = __find_CB__( v_cb, ext_list[ i ] ); if( cb != NULL ){ - cb->set_msg_id( ( cb->get_msg_id() + 1 ) & ( ~BIT7 ) ); + //cb->set_msg_id( ( cb->get_msg_id() + 1 ) & ( ~BIT7 ) ); + cb->set_msg_id( ( cb->get_msg_id() + 1 ) & ~BIT7 ); send2callboxes( __build_cb_package__( ( cb->get_ext() + 1 ), ( cb->get_port() + 1 ), __PROMPT__, ( char * )data, cb->get_msg_id(), __CB_BUFFER_SIZE__ - __VZ_HEADER_OFFSET__, write_buffer ) ); @@ -119,7 +123,8 @@ strcpy( ( char * )data, "ping\r\r\r\n" ); Call_Box * cb = __find_CB__( v_cb, ( ext_list[ i ] ) ); if( cb != NULL ){ - cb->set_msg_id( ( cb->get_msg_id() + 1 ) & ( ~BIT7 ) ); + //cb->set_msg_id( ( cb->get_msg_id() + 1 ) & ( ~BIT7 ) ); + cb->set_msg_id( ( cb->get_msg_id() + 1 ) & ~BIT7 ); send2callboxes( __build_cb_package__( ( cb->get_ext() - 1 ), ( cb->get_port() - 1 ), __PROMPT__, ( char * )data, cb->get_msg_id(), __CB_BUFFER_SIZE__ - __VZ_HEADER_OFFSET__, write_buffer ) );