Modularizando o src
Dependencies: EALib EthernetInterface_vz mbed-rtos mbed
Fork of header_main_colinas_V0-20-09-14 by
Diff: prompt.cpp
- Revision:
- 104:62646ef786a3
- Parent:
- 103:e3cabfc2f533
- Child:
- 105:a930035b6556
diff -r e3cabfc2f533 -r 62646ef786a3 prompt.cpp --- a/prompt.cpp Thu Feb 19 18:04:33 2015 +0000 +++ b/prompt.cpp Wed Feb 25 18:44:11 2015 +0000 @@ -12,7 +12,7 @@ char tmp_cmd[ DEBUGBUFSIZE ] = "help"; char last_debug_buf[ DEBUGBUFSIZE ] = "help"; -FILE *fip, *fmask, *fgate, *fport, *fsip, *fsport, *fext, *fserext, *fudpport, *ftcpport, *ftip, *ftport, *ffwip, *ffwport, *fmax, *fmin; +FILE *fip, *fmask, *fgate, *fport, *fsip, *fsport, *fext, *fserext, *fudpport, *ftcpport, *ffwip, *ffwport, *fmax, *fmin; uint8_t bufptr = 0; uint8_t last_bufptr = 0; @@ -35,205 +35,202 @@ void files( const char type ){ // show files if (type == 's' ){ - if( debug_uart3 ) pc.printf("Header IP " ); + if( debug_uart3 && !( from_eth ) ) pc.printf("Header IP " ); if( from_eth ){ snprintf( debug_buf, __PROMPT_ETH_BUFFER_SIZE__, "Header IP " ); if( tcp_session ) while( !( tcp_client.send_all( debug_buf, strlen( debug_buf ) ) ) ); - else if( udp_request ){ - udp_server.sendTo( udp_client, debug_buf, strlen( debug_buf ) ); + else if( udp_request ) + { + udp_request_send_msg( debug_buf ); } } cat("/qspi/myip.txt"); - if( debug_uart3 ) pc.printf("Header ext "); + if( debug_uart3 && !( from_eth ) ) pc.printf("Header ext "); if( from_eth ){ snprintf( debug_buf, __PROMPT_ETH_BUFFER_SIZE__, "Header ext " ); if( tcp_session ) while( !( tcp_client.send_all( debug_buf, strlen( debug_buf ) ) ) ); - else if( udp_request ){ - udp_server.sendTo( udp_client, debug_buf, strlen( debug_buf ) ); + else if( udp_request ) + { + udp_request_send_msg( debug_buf ); } } cat("/qspi/myext.txt"); - if( debug_uart3 ) pc.printf("Header port "); + if( debug_uart3 && !( from_eth ) ) pc.printf("Header port "); if( from_eth ){ snprintf( debug_buf, __PROMPT_ETH_BUFFER_SIZE__, "Header port " ); if( tcp_session ) while( !( tcp_client.send_all( debug_buf, strlen( debug_buf ) ) ) ); - else if( udp_request ){ - udp_server.sendTo( udp_client, debug_buf, strlen( debug_buf ) ); + else if( udp_request ) + { + udp_request_send_msg( debug_buf ); } } cat("/qspi/mysipport.txt"); - if( debug_uart3 ) pc.printf("Server IP "); + if( debug_uart3 && !( from_eth ) ) pc.printf("Server IP "); if( from_eth ){ snprintf( debug_buf, __PROMPT_ETH_BUFFER_SIZE__, "Server IP " ); if( tcp_session ) while( !( tcp_client.send_all( debug_buf, strlen( debug_buf ) ) ) ); - else if( udp_request ){ - udp_server.sendTo( udp_client, debug_buf, strlen( debug_buf ) ); + else if( udp_request ) + { + udp_request_send_msg( debug_buf ); } } cat("/qspi/serverip.txt"); - if( debug_uart3 ) pc.printf("Server ext "); + if( debug_uart3 && !( from_eth ) ) pc.printf("Server ext "); if( from_eth ){ snprintf( debug_buf, __PROMPT_ETH_BUFFER_SIZE__, "Server ext " ); if( tcp_session ) while( !( tcp_client.send_all( debug_buf, strlen( debug_buf ) ) ) ); - else if( udp_request ){ - udp_server.sendTo( udp_client, debug_buf, strlen( debug_buf ) ); + else if( udp_request ) + { + udp_request_send_msg( debug_buf ); } } cat("/qspi/peerext.txt"); - if( debug_uart3 ) pc.printf("Server port "); + if( debug_uart3 && !( from_eth ) ) pc.printf("Server port "); if( from_eth ){ snprintf( debug_buf, __PROMPT_ETH_BUFFER_SIZE__, "Server port " ); if( tcp_session ) while( !( tcp_client.send_all( debug_buf, strlen( debug_buf ) ) ) ); - else if( udp_request ){ - udp_server.sendTo( udp_client, debug_buf, strlen( debug_buf ) ); + else if( udp_request ) + { + udp_request_send_msg( debug_buf ); } } cat("/qspi/serverport.txt"); - if( debug_uart3 ) pc.printf("Mascara de rede "); + if( debug_uart3 && !( from_eth ) ) pc.printf("Mascara de rede "); if( from_eth ){ snprintf( debug_buf, __PROMPT_ETH_BUFFER_SIZE__, "Mascara de rede " ); if( tcp_session ) while( !( tcp_client.send_all( debug_buf, strlen( debug_buf ) ) ) ); - else if( udp_request ){ - udp_server.sendTo( udp_client, debug_buf, strlen( debug_buf ) ); + else if( udp_request ) + { + udp_request_send_msg( debug_buf ); } } cat("/qspi/mymask.txt"); - if( debug_uart3 ) pc.printf("Gateway IP "); + if( debug_uart3 && !( from_eth ) ) pc.printf("Gateway IP "); if( from_eth ){ snprintf( debug_buf, __PROMPT_ETH_BUFFER_SIZE__, "Gateway IP " ); if( tcp_session ) while( !( tcp_client.send_all( debug_buf, strlen( debug_buf ) ) ) ); - else if( udp_request ){ - udp_server.sendTo( udp_client, debug_buf, strlen( debug_buf ) ); + else if( udp_request ) + { + udp_request_send_msg( debug_buf ); } } cat("/qspi/mygateway.txt"); - if( debug_uart3 ) pc.printf("UDP Port "); + if( debug_uart3 && !( from_eth ) ) pc.printf("UDP Port "); if( from_eth ){ snprintf( debug_buf, __PROMPT_ETH_BUFFER_SIZE__, "UDP Port " ); if( tcp_session ) while( !( tcp_client.send_all( debug_buf, strlen( debug_buf ) ) ) ); - else if( udp_request ){ - udp_server.sendTo( udp_client, debug_buf, strlen( debug_buf ) ); + else if( udp_request ) + { + udp_request_send_msg( debug_buf ); } } cat("/qspi/udpport.txt"); - if( debug_uart3 ) pc.printf("TCP Port "); - if( from_eth ){ + if( debug_uart3 && !( from_eth ) ) pc.printf("TCP Port "); + if( from_eth ){ snprintf( debug_buf, __PROMPT_ETH_BUFFER_SIZE__, "TCP Port " ); if( tcp_session ) while( !( tcp_client.send_all( debug_buf, strlen( debug_buf ) ) ) ); - else if( udp_request ){ - udp_server.sendTo( udp_client, debug_buf, strlen( debug_buf ) ); + else if( udp_request ) + { + udp_request_send_msg( debug_buf ); } } cat("/qspi/tcpport.txt"); - if( debug_uart3 ) pc.printf("Telemetry Server IP "); - if( from_eth ){ - snprintf( debug_buf, __PROMPT_ETH_BUFFER_SIZE__, "Telemetry Server IP " ); - if( tcp_session ) while( !( tcp_client.send_all( debug_buf, strlen( debug_buf ) ) ) ); - - else if( udp_request ){ - udp_server.sendTo( udp_client, debug_buf, strlen( debug_buf ) ); - } - } - - cat("/qspi/telemetry_ip.txt"); - - if( debug_uart3 ) pc.printf("Telemetry Server Port "); - if( from_eth ){ - snprintf( debug_buf, __PROMPT_ETH_BUFFER_SIZE__, "Telemetry Server Port " ); - if( tcp_session ) while( !( tcp_client.send_all( debug_buf, strlen( debug_buf ) ) ) ); - - else if( udp_request ){ - udp_server.sendTo( udp_client, debug_buf, strlen( debug_buf ) ); - } - } - - cat("/qspi/telemetry_port.txt"); - - if( debug_uart3 ) pc.printf("FW Server IP "); - if( from_eth ){ + if( debug_uart3 && !( from_eth ) ) pc.printf("FW Server IP "); + if( from_eth ){ snprintf( debug_buf, __PROMPT_ETH_BUFFER_SIZE__, "FW Server IP " ); if( tcp_session ) while( !( tcp_client.send_all( debug_buf, strlen( debug_buf ) ) ) ); - else if( udp_request ){ - udp_server.sendTo( udp_client, debug_buf, strlen( debug_buf ) ); + else if( udp_request ) + { + udp_request_send_msg( debug_buf ); } } cat("/qspi/fw_ip.txt"); - if( debug_uart3 ) pc.printf("FW Server Port "); + if( debug_uart3 && !( from_eth ) ) pc.printf("FW Server Port "); if( from_eth ){ snprintf( debug_buf, __PROMPT_ETH_BUFFER_SIZE__, "FW Server Port " ); if( tcp_session ) while( !( tcp_client.send_all( debug_buf, strlen( debug_buf ) ) ) ); - else if( udp_request ){ - udp_server.sendTo( udp_client, debug_buf, strlen( debug_buf ) ); + else if( udp_request ) + { + udp_request_send_msg( debug_buf ); } } cat("/qspi/fw_port.txt"); - if( debug_uart3 ) pc.printf("Max Ext "); + if( debug_uart3 && !( from_eth ) ) pc.printf("Max Ext "); if( from_eth ){ snprintf( debug_buf, __PROMPT_ETH_BUFFER_SIZE__, "Max Ext " ); if( tcp_session ) while( !( tcp_client.send_all( debug_buf, strlen( debug_buf ) ) ) ); - else if( udp_request ){ - udp_server.sendTo( udp_client, debug_buf, strlen( debug_buf ) ); + else if( udp_request ) + { + udp_request_send_msg( debug_buf ); } } cat("/qspi/maxext.txt"); - if( debug_uart3 ) pc.printf("Min Ext "); + if( debug_uart3 && !( from_eth ) ) pc.printf("Min Ext "); if( from_eth ){ snprintf( debug_buf, __PROMPT_ETH_BUFFER_SIZE__, "Min Ext " ); if( tcp_session ) while( !( tcp_client.send_all( debug_buf, strlen( debug_buf ) ) ) ); - else if( udp_request ){ - udp_server.sendTo( udp_client, debug_buf, strlen( debug_buf ) ); + else if( udp_request ) + { + udp_request_send_msg( debug_buf ); } } cat("/qspi/minext.txt"); - //*------------ formatando a saida ----------------*// strcpy( last_cmd, tmp_cmd ); bufptr = 0; - for( uint8_t i = 0; i < DEBUGBUFSIZE; i++ ) debug_buf[ i ] = 0; + last_bufptr = 0; + for( register int i = 0; i < DEBUGBUFSIZE; i++ ) debug_buf[ i ] = 0; - if( tcp_session ) tcp_client.send_all( "\n\r> " , strlen( "\n\r> " ) ); - - else if( udp_request ){ - udp_server.sendTo( udp_client, "\n\r> ", strlen( "\n\r> " ) ); + if( from_eth ) + { + if( tcp_session ) + { + snprintf( debug_buf, __PROMPT_ETH_BUFFER_SIZE__, "\n\r> " ); + if( tcp_session ) while( !( tcp_client.send_all( debug_buf, strlen( debug_buf ) ) ) ); + } + else if( udp_request ) + { + udp_request_send_msg( "\n\r> " ); + } } } @@ -251,14 +248,11 @@ if( ftcpport ) fclose( ftcpport ); if( fmax ) fclose( fmax ); if( fmin ) fclose( fmin ); - if( ftip ) fclose( ftip ); - if( ftport ) fclose( ftport ); if( ffwip ) fclose( ffwip ); if( ffwport) fclose( ffwport ); } if (type == 'i' ){ - //debug_msg(""); // Check if files exist, if not create the files //fixme criar um bool pra cada file bool exists = true; @@ -323,18 +317,6 @@ exists = false; } - ftip = fopen("/qspi/telemetry_ip.txt", "r" ); - if( ftip == NULL ){ - set_telemetry_ip( __TELEMETRY_SERVER_IP__ ); - exists = false; - } - - ftport = fopen("/qspi/telemetry_port.txt", "r" ); - if( ftport == NULL ){ - set_telemetry_port( __TELEMETRY_SERVER_PORT__ ); - exists = false; - } - ffwip = fopen("/qspi/fw_ip.txt", "r" ); if( ffwip == NULL ){ set_fw_ip( __FW_SERVER_IP__ ); @@ -360,14 +342,14 @@ } if( !exists ){ - if( debug_uart3 ) pc.printf("\n\rDefault configurations set!\n\r"); + if( debug_uart3 && !( from_eth ) ) pc.printf("\n\rDefault configurations set!\n\r"); if( from_eth ){ snprintf( debug_buf, __PROMPT_ETH_BUFFER_SIZE__, "Default configurations set!\n\r"); debug_buf[ strlen( debug_buf ) - 1 ] = '\0'; if( tcp_session ){ tcp_client.send_all( debug_buf, strlen( debug_buf ) ); bufptr = 0; - for( uint8_t i = 0; i < DEBUGBUFSIZE; i++ ) debug_buf[ i ] = 0; + for( register int i = 0; i < DEBUGBUFSIZE; i++ ) debug_buf[ i ] = 0; } } } @@ -386,8 +368,6 @@ fserext = fopen( "/qspi/peerext.txt", "r" ); fudpport = fopen( "/qspi/udpport.txt", "r" ); ftcpport = fopen( "/qspi/tcpport.txt", "r" ); - ftip = fopen("/qspi/telemetry_ip.txt", "r" ); - ftport = fopen("/qspi/telemetry_port.txt", "r" ); ffwip = fopen("/qspi/fw_ip.txt", "r" ); ffwport = fopen("/qspi/fw_port.txt", "r" ); fmax = fopen("/qspi/maxext.txt", "r" ); @@ -416,10 +396,6 @@ set_tcp_port_listener( TCP_PORT_LISTENER ); - set_telemetry_ip( __TELEMETRY_SERVER_IP__ ); - - set_telemetry_port( __TELEMETRY_SERVER_PORT__ ); - set_fw_ip( __FW_SERVER_IP__ ); set_fw_port( __FW_SERVER_PORT__ ); @@ -430,17 +406,18 @@ strcpy( last_cmd, tmp_cmd ); - if( debug_uart3 ) pc.printf("\n\rDefault configurations set!\n\r"); + if( debug_uart3 && !( from_eth ) ) pc.printf("\n\rDefault configurations set!\n\r"); if( from_eth ){ snprintf( debug_buf, __PROMPT_ETH_BUFFER_SIZE__, "\n\rDefault configurations set!\n\r"); debug_buf[ strlen( debug_buf ) - 1 ] = '\0'; if( tcp_session ){ tcp_client.send_all( debug_buf, strlen( debug_buf ) ); - }else if( udp_request ){ - udp_server.sendTo( udp_client, debug_buf, strlen( debug_buf ) ); + }else if( udp_request ) + { + udp_request_send_msg( debug_buf ); } bufptr = 0; - for( uint8_t i = 0; i < DEBUGBUFSIZE; i++ ) debug_buf[ i ] = 0; + for( register int i = 0; i < DEBUGBUFSIZE; i++ ) debug_buf[ i ] = 0; } } @@ -456,8 +433,6 @@ fserext = fopen( "/qspi/peerext.txt", "w" ); fudpport = fopen( "/qspi/udpport.txt", "w" ); ftcpport = fopen( "/qspi/tcpport.txt", "w" ); - ftip = fopen("/qspi/telemetry_ip.txt", "w" ); - ftport = fopen("/qspi/telemetry_port.txt", "w" ); ffwip = fopen("/qspi/fw_ip.txt", "w" ); ffwport = fopen("/qspi/fw_port.txt", "w" ); fmax = fopen("/qspi/maxext.txt", "w" ); @@ -478,9 +453,6 @@ fprintf( fudpport, "%i\n\r", 0 ); fprintf( ftcpport, "%i\n\r", 0 ); - fprintf( ftip, "%s\n\r","" ); - fprintf( ftport, "%i\n\r",0 ); - fprintf( ffwip, "%s\n\r","" ); fprintf( ffwport, "%i\n\r",0 ); @@ -489,17 +461,20 @@ files('c'); - if( debug_uart3 ) pc.printf("\n\rErased configurations set!\n\r"); + if( debug_uart3 && !( from_eth ) ) pc.printf("\n\rErased configurations set!\n\r"); if( from_eth ){ snprintf( debug_buf, __PROMPT_ETH_BUFFER_SIZE__, "\n\rErased configurations set!\n\r"); debug_buf[ strlen( debug_buf ) - 1 ] = '\0'; - if( tcp_session ){ + if( tcp_session ) + { tcp_client.send_all( debug_buf, strlen( debug_buf ) ); - }else if( udp_request ){ - udp_server.sendTo( udp_client, debug_buf, strlen( debug_buf ) ); + } + else if( udp_request ) + { + udp_request_send_msg( debug_buf ); } bufptr = 0; - for( uint8_t i = 0; i < DEBUGBUFSIZE; i++ ) debug_buf[ i ] = 0; + for( register int i = 0; i < DEBUGBUFSIZE; i++ ) debug_buf[ i ] = 0; } } } @@ -509,7 +484,7 @@ // init file system and check if files exist if (!qspifs.isformatted()) { qspifs.format(); - if( debug_uart3 ) pc.printf("\n\rFile system configured!!\n\r"); + if( debug_uart3 && !( from_eth ) ) pc.printf("\n\rFile system configured!!\n\r"); } files('i'); // check if the files are created files('c'); @@ -523,7 +498,7 @@ tcp_server.set_blocking( false, 0 ); udp_server.set_blocking( false, 0 ); udp_server.bind( UDP_PORT_LISTENER ); - if( debug_uart3 ) pc.printf("******* Prompt eth Ready *******\n\r"); + if( debug_uart3 && !( from_eth ) ) pc.printf("******* Prompt eth Ready *******\n\r"); } // main prompt process @@ -562,8 +537,8 @@ tcp_session = true; tcp_timer.start(); last_bufptr = bufptr; - eth_buffer[ 0 ] = 0; - bufret = 0; + //eth_buffer[ 0 ] = 0; + for( register int i = 0; i < __PROMPT_ETH_BUFFER_SIZE__; i++ ) eth_buffer[ i ] = 0; } if( tcp_session ) { tcp_client.set_blocking( false, 0 ); @@ -612,9 +587,10 @@ }else if( b == 0x09 ){ // ignore tab }else{ - debug_buf[bufptr] = b; + debug_buf[ bufptr ] = b; bufptr++; } + last_bufptr = bufptr; } } } @@ -622,10 +598,11 @@ if( msg_from_cb ){ if( tcp_session ){ tcp_client.send_all( msg_from_cb, strlen( msg_from_cb ) ); - }else if( udp_request ){ - udp_server.sendTo( udp_client, msg_from_cb, strlen( msg_from_cb ) ); + }else if( udp_request ) + { + udp_request_send_msg( msg_from_cb ); } - if( debug_uart3 ) pc.printf( "\n\r%s\n\r", msg_from_cb ); + if( debug_uart3 && !( from_eth ) ) pc.printf( "\n\r%s\n\r", msg_from_cb ); } if( flood_silence ){ @@ -637,14 +614,15 @@ int port = convert_ext_to_port( ext_count ); send2callboxes( __build_cb_package__( ext_count, port, __PROMPT__, cmd, id_msg++, __CB_BUFFER_SIZE__ - __VZ_HEADER_OFFSET__, write_buffer ) ); - if( debug_uart3 ) pc.printf("\r\nSilence sent to ext=%d port=%d", ext_count, port ); + if( debug_uart3 && !( from_eth ) ) pc.printf("\r\nSilence sent to ext=%d port=%d", ext_count, port ); if( tcp_session ){ snprintf( eth_buffer, __PROMPT_ETH_BUFFER_SIZE__, "\r\nSilence sent to ext=%d port=%d", ext_count, port ); tcp_client.send_all( eth_buffer, strlen( eth_buffer ) ); - }else if( udp_request ){ + }else if( udp_request ) + { snprintf( eth_buffer, __PROMPT_ETH_BUFFER_SIZE__, "\r\nSilence sent to ext=%d port=%d", ext_count, port ); - udp_server.sendTo( udp_client, eth_buffer, strlen( eth_buffer ) ); + udp_request_send_msg( eth_buffer ); } flood_silence_timer.reset(); @@ -654,13 +632,14 @@ flood_silence_timer.stop(); flood_silence_timer.reset(); - if( debug_uart3 ) pc.printf("\r\n> " ); + if( debug_uart3 && !( from_eth ) ) pc.printf("\r\n> " ); if( tcp_session ){ snprintf( eth_buffer, __PROMPT_ETH_BUFFER_SIZE__, "\r\n> " ); tcp_client.send_all( eth_buffer, strlen( eth_buffer ) ); - }else if( udp_request ){ + }else if( udp_request ) + { snprintf( eth_buffer, __PROMPT_ETH_BUFFER_SIZE__, "\r\n> " ); - udp_server.sendTo( udp_client, eth_buffer, strlen( eth_buffer ) ); + udp_request_send_msg( eth_buffer ); } } } @@ -673,7 +652,7 @@ pflood = 1; flood_timeout.start(); delayed_flood = false; - if( debug_uart3 ) pc.printf("\n\rFlood ON\n\r"); + if( debug_uart3 && !( from_eth ) ) pc.printf("\n\rFlood ON\n\r"); if( from_eth ){ snprintf( debug_buf, __PROMPT_ETH_BUFFER_SIZE__, "Flood On\n\r" ); } @@ -706,7 +685,7 @@ }else if( xmemmatch( (uint8_t*)debug_buf, (uint8_t*) "-- ", 3 ) ){ miss_match = false; int ext = atoi( debug_buf + 3 ); - if( debug_uart3 ) pc.printf("\n\rFlood OFF\n\r"); + if( debug_uart3 && !( from_eth ) ) pc.printf("\n\rFlood OFF\n\r"); if( from_eth ){ snprintf( debug_buf, __PROMPT_ETH_BUFFER_SIZE__, "Flood OFF\n\r" ); } @@ -725,7 +704,7 @@ if( xstrmatch( (uint8_t*)debug_buf, (uint8_t*) "ifconfig" ) ){ miss_match = false; - if( debug_uart3 ) pc.printf("\n\r"); + if( debug_uart3 && !( from_eth ) ) pc.printf("\n\r"); files('s'); } @@ -750,7 +729,7 @@ else if( xstrmatch( (uint8_t*)debug_buf, (uint8_t*) "format" ) ){ miss_match = false; - if( debug_uart3 ) pc.printf("\n\rFormatando o sistema de arquivos... espere o sistema reiniciar\n\r"); + if( debug_uart3 && !( from_eth ) ) pc.printf("\n\rFormatando o sistema de arquivos... espere o sistema reiniciar\n\r"); if( from_eth ){ snprintf( debug_buf, __PROMPT_ETH_BUFFER_SIZE__, "Not Allowed\n\r"); @@ -821,18 +800,6 @@ set_server_port( atoi( debug_buf + 7 ) ); files('s'); } - - else if( xmemmatch( (uint8_t*)debug_buf, (uint8_t*) "telemetry_ip ", 13 ) ){ - miss_match = false; - set_telemetry_ip( debug_buf + 13 ); - files('s'); - } - - else if( xmemmatch( (uint8_t*)debug_buf, (uint8_t*) "telemetry_port ", 15 ) ){ - miss_match = false; - set_telemetry_port( atoi( debug_buf + 15 ) ); - files('s'); - } else if( xmemmatch( (uint8_t*)debug_buf, (uint8_t*) "fw_ip ", 6 ) ){ miss_match = false; @@ -855,15 +822,16 @@ else if( xstrmatch( (uint8_t*)debug_buf, (uint8_t*) "reset" ) ){ miss_match = false; - if( debug_uart3 ) pc.printf("\n\rJob is done\n\r"); + if( debug_uart3 && !( from_eth ) ) pc.printf("\n\rJob is done\n\r"); if( from_eth ){ snprintf( debug_buf, __PROMPT_ETH_BUFFER_SIZE__, "Job is done\n\r"); debug_buf[ strlen( debug_buf ) - 1 ] = '\0'; if( tcp_session ){ tcp_client.send_all( debug_buf, strlen( debug_buf ) ); tcp_client.close(); - }else if( udp_request ){ - udp_server.sendTo( udp_client, debug_buf, strlen( debug_buf ) ); + }else if( udp_request ) + { + udp_request_send_msg( debug_buf ); } } __disable_irq(); @@ -872,7 +840,7 @@ else if( xstrmatch( (uint8_t*)debug_buf, (uint8_t*) "dog" ) ){ miss_match = false; - if( debug_uart3 ) pc.printf("\n\r MUUUUUUUuuuuUUUUUU - I'm not a dog!!!! \n\r"); + if( debug_uart3 && !( from_eth ) ) pc.printf("\n\r MUUUUUUUuuuuUUUUUU - I'm not a dog!!!! \n\r"); if( from_eth ){ snprintf( debug_buf, __PROMPT_ETH_BUFFER_SIZE__, "MUUUUUUUuuuuUUUUUU - I'm not a dog!!!!\n\r"); //debug_buf[ strlen( debug_buf ) - 1 ] = '\0'; @@ -881,7 +849,7 @@ else if( xstrmatch( (uint8_t*)debug_buf, (uint8_t*) "ftq" ) ){ miss_match = false; - if( debug_uart3 ) pc.printf( "\n\rFTQ ON\n\r" ); + if( debug_uart3 && !( from_eth ) ) pc.printf( "\n\rFTQ ON\n\r" ); if( from_eth ){ snprintf( debug_buf, __PROMPT_ETH_BUFFER_SIZE__, "FTQ On\n\r" ); debug_buf[ strlen( debug_buf ) - 1 ] = '\0'; @@ -891,7 +859,7 @@ else if( xstrmatch( (uint8_t*)debug_buf, (uint8_t*) "ktq" ) ){ miss_match = false; - if( debug_uart3 ) pc.printf( "\n\rFTQ!!!\n\r" ); + if( debug_uart3 && !( from_eth ) ) pc.printf( "\n\rFTQ!!!\n\r" ); if( from_eth ){ snprintf( debug_buf, __PROMPT_ETH_BUFFER_SIZE__, "FTQ!!!\n\r" ); debug_buf[ strlen( debug_buf ) - 1 ] = '\0'; @@ -914,6 +882,11 @@ main_test = !main_test; } + else if( xstrmatch( (uint8_t*)debug_buf, (uint8_t*) "size" ) ){ + miss_match = false; + sizes = !sizes; + } + else if( xstrmatch( (uint8_t*)debug_buf, (uint8_t*) "show_sip" ) ){ miss_match = false; show_sip = true; @@ -940,10 +913,15 @@ debug_eth = true; } + else if( xstrmatch( (uint8_t*)debug_buf, (uint8_t*) "rec_stats" ) ){ + miss_match = false; + reconnect_stats = true; + } + else if( xstrmatch( (uint8_t*)debug_buf, (uint8_t*) "types" ) ){ miss_match = false; - if( debug_uart3 ) pc.printf( "\n\rhex :: dec :: Type \n\r0x00 :: 0 :: boot \n\r0x02 :: 2 :: registry \n\r0x04 :: 4 :: invite \n\r0x08 :: 8 :: audio \n\r0x10 :: 16 :: telemetry \n\r0x20 :: 32 :: cb_bye \n\r0x01 :: 1 :: prompt \n\r0x40 :: 64 :: flood \n\r" ); + if( debug_uart3 && !( from_eth ) ) pc.printf( "\n\rhex :: dec :: Type \n\r0x00 :: 0 :: boot \n\r0x02 :: 2 :: registry \n\r0x04 :: 4 :: invite \n\r0x08 :: 8 :: audio \n\r0x10 :: 16 :: telemetry \n\r0x20 :: 32 :: cb_bye \n\r0x01 :: 1 :: prompt \n\r0x40 :: 64 :: flood \n\r" ); if( from_eth ){ snprintf( debug_buf, __PROMPT_ETH_BUFFER_SIZE__, "\n\rhex :: dec :: Type \n\r0x00 :: 0 :: boot \n\r0x02 :: 2 :: registry \n\r0x04 :: 4 :: invite \n\r0x08 :: 8 :: audio \n\r0x10 :: 16 :: telemetry \n\r0x20 :: 32 :: cb_bye \n\r0x01 :: 1 :: prompt \n\r0x40 :: 64 :: flood \n\r" ); @@ -953,7 +931,7 @@ else if( xstrmatch( (uint8_t*)debug_buf, (uint8_t*) "protocol" ) ){ miss_match = false; - if( debug_uart3 ) pc.printf( "\n\r| E | E | P | P | C | C | T | [ Seq_num | Audio ] | 14[ Clock | Audio ] | [ TS | Audio ] | ... |\n\r \n\rE = Ext = Ramal\n\r \n\rP = Port = Porta\n\r \n\rC = Checksum\n\r \n\rT = Type = Tipo\n\r \n\rSeq_num = Sequence Number = Numero de sequencia\n\r \n\rClock = 14 bytes to sync\n\r \n\r... = demais __CB_BUFFER_SIZE__ - __VZ_HEADER_OFFSET__ bytes\n\r" ); + if( debug_uart3 && !( from_eth ) ) pc.printf( "\n\r| E | E | P | P | C | C | T | [ Seq_num | Audio ] | 14[ Clock | Audio ] | [ TS | Audio ] | ... |\n\r \n\rE = Ext = Ramal\n\r \n\rP = Port = Porta\n\r \n\rC = Checksum\n\r \n\rT = Type = Tipo\n\r \n\rSeq_num = Sequence Number = Numero de sequencia\n\r \n\rClock = 14 bytes to sync\n\r \n\r... = demais __CB_BUFFER_SIZE__ - __VZ_HEADER_OFFSET__ bytes\n\r" ); if( from_eth ){ snprintf( debug_buf, __PROMPT_ETH_BUFFER_SIZE__, "\n\r| E | E | P | P | C | C | T | [ Seq_num | Audio ] | 14[ Clock | Audio ] | [ TS | Audio ] | ... |\n\r \n\rE = Ext = Ramal\n\r \n\rP = Port = Porta\n\r \n\rC = Checksum\n\r \n\rT = Type = Tipo\n\r \n\rSeq_num = Sequence Number = Numero de sequencia\n\r \n\rClock = 14 bytes to sync\n\r \n\r... = demais __CB_BUFFER_SIZE__ - __VZ_HEADER_OFFSET__ bytes\n\r" ); @@ -963,7 +941,7 @@ else if( xmemmatch( (uint8_t*)debug_buf, (uint8_t*) "flood ", 6 ) ){ if (xmemmatch( (uint8_t*)(debug_buf+6), (uint8_t*) "on", 2 ) ){ miss_match = false; - if( debug_uart3 ) pc.printf("\n\rFlood ON\n\r"); + if( debug_uart3 && !( from_eth ) ) pc.printf("\n\rFlood ON\n\r"); if( from_eth ){ snprintf( debug_buf, __PROMPT_ETH_BUFFER_SIZE__, "Flood On\n\r" ); debug_buf[ strlen( debug_buf ) - 1 ] = '\0'; @@ -977,7 +955,7 @@ if (xmemmatch( (uint8_t*)(debug_buf+6), (uint8_t*) "more", 4 ) ){ miss_match = false; - if( debug_uart3 ) pc.printf("\n\rFlood ON\n\r"); + if( debug_uart3 && !( from_eth ) ) pc.printf("\n\rFlood ON\n\r"); if( from_eth ){ snprintf( debug_buf, __PROMPT_ETH_BUFFER_SIZE__, "Flood On\n\r" ); } @@ -989,7 +967,7 @@ if (xmemmatch( (uint8_t*)(debug_buf+6), (uint8_t*) "off", 3 )) { miss_match = false; - if( debug_uart3 ) pc.printf("\n\rFlood OFF\n\r"); + if( debug_uart3 && !( from_eth ) ) pc.printf("\n\rFlood OFF\n\r"); if( from_eth ){ snprintf( debug_buf, __PROMPT_ETH_BUFFER_SIZE__, "Flood Off\n\r" ); debug_buf[ strlen( debug_buf ) - 1 ] = '\0'; @@ -1005,7 +983,7 @@ strcpy( promptcb_last_cmd, debug_buf ); if( !( strcmp( debug_buf + 8, "-h" ) && strcmp( debug_buf + 8, "--help" ) ) ){ - if( debug_uart3 ) pc.printf("\n\rUsage :: silence start_ext end_ext | start_ext must be greater than end_ext\n\rObs : ( end_ext - start_ext ) < 50 "); + if( debug_uart3 && !( from_eth ) ) pc.printf("\n\rUsage :: silence start_ext end_ext | start_ext must be greater than end_ext\n\rObs : ( end_ext - start_ext ) < 50 "); if( tcp_session ){ snprintf( eth_buffer, __PROMPT_ETH_BUFFER_SIZE__, "Usage :: silence start_ext end_ext | start_ext must be greater than end_ext\n\rObs : ( end_ext - start_ext ) < 50 " ); @@ -1030,7 +1008,7 @@ ext_count = start_ext; flood_silence_timer.start(); }else{ - if( debug_uart3 ) pc.printf("\n\rUsage Error :: silence start_ext end_ext | start_ext must be greater than end_ext\n\rObs : ( end_ext - start_ext ) < 50 "); + if( debug_uart3 && !( from_eth ) ) pc.printf("\n\rUsage Error :: silence start_ext end_ext | start_ext must be greater than end_ext\n\rObs : ( end_ext - start_ext ) < 50 "); if( tcp_session ){ snprintf( eth_buffer, __PROMPT_ETH_BUFFER_SIZE__, "Usage Error :: silence start_ext end_ext | start_ext must be greater than end_ext\n\rObs : ( end_ext - start_ext ) < 50 " ); @@ -1043,7 +1021,7 @@ else if( xmemmatch( (uint8_t*)debug_buf, (uint8_t*) "debug ",6 ) ){ if( xmemmatch( (uint8_t*)(debug_buf+6), (uint8_t*) "on",2 )) { miss_match = false; - if( debug_uart3 ) pc.printf("\n\rDebug ON\n\r"); + if( debug_uart3 && !( from_eth ) ) pc.printf("\n\rDebug ON\n\r"); if( from_eth ){ snprintf( debug_buf, __PROMPT_ETH_BUFFER_SIZE__, "Debug On\n\r" ); debug_buf[ strlen( debug_buf ) - 1 ] = '\0'; @@ -1052,7 +1030,7 @@ } if( xmemmatch( (uint8_t*)(debug_buf+6), (uint8_t*) "off",3 )) { miss_match = false; - if( debug_uart3 ) pc.printf("\n\rDebug OFF\n\r"); + if( debug_uart3 && !( from_eth ) ) pc.printf("\n\rDebug OFF\n\r"); if( from_eth ){ snprintf( debug_buf, __PROMPT_ETH_BUFFER_SIZE__, "Debug Off\n\r" ); debug_buf[ strlen( debug_buf ) - 1 ] = '\0'; @@ -1061,18 +1039,18 @@ } if( xmemmatch( (uint8_t*)(debug_buf+6), (uint8_t*) "show",4 ) ){ miss_match = false; - if( debug_uart3 ) pc.printf("\n\rdsip"); - if( debug_uart3 ) pc.printf("\n\rdebug_alive"); - if( debug_uart3 ) pc.printf("\n\rdebug_prompt"); - if( debug_uart3 ) pc.printf("\n\rdebug_vector"); - if( debug_uart3 ) pc.printf("\n\rdebug_cb"); - if( debug_uart3 ) pc.printf("\n\rdebug_main"); - if( debug_uart3 ) pc.printf("\n\rdcks"); - if( debug_uart3 ) pc.printf("\n\rdebug_cb_rx"); - if( debug_uart3 ) pc.printf("\n\rdebug_cb_tx*"); - if( debug_uart3 ) pc.printf("\n\rdebug_eth_rx*"); - if( debug_uart3 ) pc.printf("\n\rdebug_eth_tx*"); - if( debug_uart3 ) pc.printf("\n\rdebug_file"); + if( debug_uart3 && !( from_eth ) ) pc.printf("\n\rdsip"); + if( debug_uart3 && !( from_eth ) ) pc.printf("\n\rdebug_alive"); + if( debug_uart3 && !( from_eth ) ) pc.printf("\n\rdebug_prompt"); + if( debug_uart3 && !( from_eth ) ) pc.printf("\n\rdebug_vector"); + if( debug_uart3 && !( from_eth ) ) pc.printf("\n\rdebug_cb"); + if( debug_uart3 && !( from_eth ) ) pc.printf("\n\rdebug_main"); + if( debug_uart3 && !( from_eth ) ) pc.printf("\n\rdcks"); + if( debug_uart3 && !( from_eth ) ) pc.printf("\n\rdebug_cb_rx"); + if( debug_uart3 && !( from_eth ) ) pc.printf("\n\rdebug_cb_tx*"); + if( debug_uart3 && !( from_eth ) ) pc.printf("\n\rdebug_eth_rx*"); + if( debug_uart3 && !( from_eth ) ) pc.printf("\n\rdebug_eth_tx*"); + if( debug_uart3 && !( from_eth ) ) pc.printf("\n\rdebug_file"); if( from_eth ){ snprintf( debug_buf, __PROMPT_ETH_BUFFER_SIZE__, "\n\rdsip \n\rdebug_alive \n\rdebug_prompt \n\rdebug_vector \n\rdebug_cb \n\rdebug_main \n\rdcks \n\rdebug_cb_rx \n\rdebug_cb_tx* \n\rdebug_eth_rx* \n\rdebug_eth_tx* \n\rdebug_file\n\r" ); @@ -1084,7 +1062,7 @@ else if( xmemmatch( (uint8_t*)debug_buf, (uint8_t*) "dsip ", 5 ) ){ if (xmemmatch( (uint8_t*)(debug_buf + 5 ), (uint8_t*) "on", 2 ) ){ miss_match = false; - if( debug_uart3 ) pc.printf( "\n\rSip Debug ON\n\r" ); + if( debug_uart3 && !( from_eth ) ) pc.printf( "\n\rSip Debug ON\n\r" ); if( from_eth ){ snprintf( debug_buf, __PROMPT_ETH_BUFFER_SIZE__, "Sip Debug On\n\r" ); debug_buf[ strlen( debug_buf ) - 1 ] = '\0'; @@ -1093,7 +1071,7 @@ } if (xmemmatch( (uint8_t*)(debug_buf + 5 ), (uint8_t*) "off",3 )) { miss_match = false; - if( debug_uart3 ) pc.printf( "\n\rSip Debug OFF\n\r" ); + if( debug_uart3 && !( from_eth ) ) pc.printf( "\n\rSip Debug OFF\n\r" ); if( from_eth ){ snprintf( debug_buf, __PROMPT_ETH_BUFFER_SIZE__, "Sip Debug Off\n\r" ); debug_buf[ strlen( debug_buf ) - 1 ] = '\0'; @@ -1102,21 +1080,42 @@ } } + else if( xmemmatch( (uint8_t*)debug_buf, (uint8_t*) "dreconnect ", 11 ) ){ + if (xmemmatch( (uint8_t*)(debug_buf + 11 ), (uint8_t*) "on", 2 ) ){ + miss_match = false; + if( debug_uart3 && !( from_eth ) ) pc.printf( "\n\rReconnecet Debug ON\n\r" ); + if( from_eth ){ + snprintf( debug_buf, __PROMPT_ETH_BUFFER_SIZE__, "Reconnecet Debug On\n\r" ); + debug_buf[ strlen( debug_buf ) - 1 ] = '\0'; + } + debug_reconnect = true; + } + if (xmemmatch( (uint8_t*)(debug_buf + 11 ), (uint8_t*) "off", 3 )) { + miss_match = false; + if( debug_uart3 && !( from_eth ) ) pc.printf( "\n\rReconnecet Debug OFF\n\r" ); + if( from_eth ){ + snprintf( debug_buf, __PROMPT_ETH_BUFFER_SIZE__, "Reconnecet Debug Off\n\r" ); + debug_buf[ strlen( debug_buf ) - 1 ] = '\0'; + } + debug_reconnect = false; + } + } + else if( xmemmatch( (uint8_t*)debug_buf, (uint8_t*) "duart ", 6 ) ){ if (xmemmatch( (uint8_t*)(debug_buf + 6 ), (uint8_t*) "on", 2 ) ){ miss_match = false; - if( debug_uart3 ) pc.printf( "\n\rEnable UART3 usage\n\r" ); + if( debug_uart3 && !( from_eth ) ) pc.printf( "\n\rEnable UART3 usage\n\r" ); if( from_eth ){ - snprintf( debug_buf, __PROMPT_ETH_BUFFER_SIZE__, "Dinable UART3 usage\n\r" ); + snprintf( debug_buf, __PROMPT_ETH_BUFFER_SIZE__, "Enable UART3 usage\n\r" ); debug_buf[ strlen( debug_buf ) - 1 ] = '\0'; } debug_uart3 = true; } if (xmemmatch( (uint8_t*)(debug_buf + 6 ), (uint8_t*) "off",3 )) { miss_match = false; - if( debug_uart3 ) pc.printf( "\n\rEnable UART3 usage\n\r" ); + if( debug_uart3 && !( from_eth ) ) pc.printf( "\n\rDisable UART3 usage\n\r" ); if( from_eth ){ - snprintf( debug_buf, __PROMPT_ETH_BUFFER_SIZE__, "Dinable UART3 usage\n\r" ); + snprintf( debug_buf, __PROMPT_ETH_BUFFER_SIZE__, "Disable UART3 usage\n\r" ); debug_buf[ strlen( debug_buf ) - 1 ] = '\0'; } debug_uart3 = false; @@ -1126,7 +1125,7 @@ else if( xmemmatch( (uint8_t*)debug_buf, (uint8_t*) "dmatch ", 7 ) ){ if (xmemmatch( (uint8_t*)(debug_buf + 7 ), (uint8_t*) "on", 2 ) ){ miss_match = false; - if( debug_uart3 ) pc.printf( "\n\rPort Match Debug ON\n\r" ); + if( debug_uart3 && !( from_eth ) ) pc.printf( "\n\rPort Match Debug ON\n\r" ); if( from_eth ){ snprintf( debug_buf, __PROMPT_ETH_BUFFER_SIZE__, "Port Match Debug On\n\r" ); debug_buf[ strlen( debug_buf ) - 1 ] = '\0'; @@ -1135,7 +1134,7 @@ } if (xmemmatch( (uint8_t*)(debug_buf + 7 ), (uint8_t*) "off",3 )) { miss_match = false; - if( debug_uart3 ) pc.printf( "\n\rPort Match Debug OFF\n\r" ); + if( debug_uart3 && !( from_eth ) ) pc.printf( "\n\rPort Match Debug OFF\n\r" ); if( from_eth ){ snprintf( debug_buf, __PROMPT_ETH_BUFFER_SIZE__, "Port Match Debug Off\n\r" ); debug_buf[ strlen( debug_buf ) - 1 ] = '\0'; @@ -1147,7 +1146,7 @@ else if( xmemmatch( (uint8_t*)debug_buf, (uint8_t*) "dmuted ", 7 ) ){ if (xmemmatch( (uint8_t*)(debug_buf + 7 ), (uint8_t*) "on", 2 ) ){ miss_match = false; - if( debug_uart3 ) pc.printf( "\n\rMuted Debug ON\n\r" ); + if( debug_uart3 && !( from_eth ) ) pc.printf( "\n\rMuted Debug ON\n\r" ); if( from_eth ){ snprintf( debug_buf, __PROMPT_ETH_BUFFER_SIZE__, "Muted Debug On\n\r" ); debug_buf[ strlen( debug_buf ) - 1 ] = '\0'; @@ -1156,7 +1155,7 @@ } if (xmemmatch( (uint8_t*)(debug_buf + 7 ), (uint8_t*) "off",3 )) { miss_match = false; - if( debug_uart3 ) pc.printf( "\n\rMuted Debug OFF\n\r" ); + if( debug_uart3 && !( from_eth ) ) pc.printf( "\n\rMuted Debug OFF\n\r" ); if( from_eth ){ snprintf( debug_buf, __PROMPT_ETH_BUFFER_SIZE__, "Muted Debug Off\n\r" ); debug_buf[ strlen( debug_buf ) - 1 ] = '\0'; @@ -1168,7 +1167,7 @@ else if( xmemmatch( (uint8_t*)debug_buf, (uint8_t*) "dwdt ", 5 ) ){ if (xmemmatch( (uint8_t*)(debug_buf + 5 ), (uint8_t*) "on", 2 ) ){ miss_match = false; - if( debug_uart3 ) pc.printf( "\n\rWdt Debug ON\n\r" ); + if( debug_uart3 && !( from_eth ) ) pc.printf( "\n\rWdt Debug ON\n\r" ); if( from_eth ){ snprintf( debug_buf, __PROMPT_ETH_BUFFER_SIZE__, "Wdt Debug On\n\r" ); debug_buf[ strlen( debug_buf ) - 1 ] = '\0'; @@ -1177,7 +1176,7 @@ } if (xmemmatch( (uint8_t*)(debug_buf + 5 ), (uint8_t*) "off",3 )) { miss_match = false; - if( debug_uart3 ) pc.printf( "\n\rWdt Debug OFF\n\r" ); + if( debug_uart3 && !( from_eth ) ) pc.printf( "\n\rWdt Debug OFF\n\r" ); if( from_eth ){ snprintf( debug_buf, __PROMPT_ETH_BUFFER_SIZE__, "Wdt Debug Off\n\r" ); debug_buf[ strlen( debug_buf ) - 1 ] = '\0'; @@ -1189,7 +1188,7 @@ else if( xmemmatch( (uint8_t*)debug_buf, (uint8_t*) "drefresh ", 9 ) ){ if (xmemmatch( (uint8_t*)(debug_buf + 9 ), (uint8_t*) "on", 2 ) ){ miss_match = false; - if( debug_uart3 ) pc.printf( "\n\rRefresh Debug ON\n\r" ); + if( debug_uart3 && !( from_eth ) ) pc.printf( "\n\rRefresh Debug ON\n\r" ); if( from_eth ){ snprintf( debug_buf, __PROMPT_ETH_BUFFER_SIZE__, "Refresh Debug On\n\r" ); debug_buf[ strlen( debug_buf ) - 1 ] = '\0'; @@ -1198,7 +1197,7 @@ } if (xmemmatch( (uint8_t*)(debug_buf + 9 ), (uint8_t*) "off",3 )) { miss_match = false; - if( debug_uart3 ) pc.printf( "\n\rRefresh Debug OFF\n\r" ); + if( debug_uart3 && !( from_eth ) ) pc.printf( "\n\rRefresh Debug OFF\n\r" ); if( from_eth ){ snprintf( debug_buf, __PROMPT_ETH_BUFFER_SIZE__, "Refresh Debug Off\n\r" ); debug_buf[ strlen( debug_buf ) - 1 ] = '\0'; @@ -1210,7 +1209,7 @@ else if( xmemmatch( (uint8_t*)debug_buf, (uint8_t*) "dping ", 6 ) ){ if (xmemmatch( (uint8_t*)(debug_buf + 6 ), (uint8_t*) "on", 2 ) ){ miss_match = false; - if( debug_uart3 ) pc.printf( "\n\rPing Debug ON\n\r" ); + if( debug_uart3 && !( from_eth ) ) pc.printf( "\n\rPing Debug ON\n\r" ); if( from_eth ){ snprintf( debug_buf, __PROMPT_ETH_BUFFER_SIZE__, "Ping Debug On\n\r" ); debug_buf[ strlen( debug_buf ) - 1 ] = '\0'; @@ -1219,7 +1218,7 @@ } if (xmemmatch( (uint8_t*)(debug_buf + 6 ), (uint8_t*) "off",3 )) { miss_match = false; - if( debug_uart3 ) pc.printf( "\n\rPing Debug OFF\n\r" ); + if( debug_uart3 && !( from_eth ) ) pc.printf( "\n\rPing Debug OFF\n\r" ); if( from_eth ){ snprintf( debug_buf, __PROMPT_ETH_BUFFER_SIZE__, "Ping Debug Off\n\r" ); debug_buf[ strlen( debug_buf ) - 1 ] = '\0'; @@ -1231,7 +1230,7 @@ else if( xmemmatch( (uint8_t*)debug_buf, (uint8_t*) "dwu ", 4 ) ){ if (xmemmatch( (uint8_t*)(debug_buf + 4 ), (uint8_t*) "on", 2 ) ){ miss_match = false; - if( debug_uart3 ) pc.printf( "\n\rWake Up Debug ON\n\r" ); + if( debug_uart3 && !( from_eth ) ) pc.printf( "\n\rWake Up Debug ON\n\r" ); if( from_eth ){ snprintf( debug_buf, __PROMPT_ETH_BUFFER_SIZE__, "Wake Up Debug On\n\r" ); debug_buf[ strlen( debug_buf ) - 1 ] = '\0'; @@ -1240,7 +1239,7 @@ } if (xmemmatch( (uint8_t*)(debug_buf + 4 ), (uint8_t*) "off",3 )) { miss_match = false; - if( debug_uart3 ) pc.printf( "\n\rWake Up Debug OFF\n\r" ); + if( debug_uart3 && !( from_eth ) ) pc.printf( "\n\rWake Up Debug OFF\n\r" ); if( from_eth ){ snprintf( debug_buf, __PROMPT_ETH_BUFFER_SIZE__, "Wake Up Debug Off\n\r" ); debug_buf[ strlen( debug_buf ) - 1 ] = '\0'; @@ -1252,7 +1251,7 @@ else if( xmemmatch( (uint8_t*)debug_buf, (uint8_t*) "tcp_alive ", 10 ) ){ if (xmemmatch( (uint8_t*)(debug_buf + 10 ), (uint8_t*) "on", 2 ) ){ miss_match = false; - if( debug_uart3 ) pc.printf( "\n\rTCP don't drop mode on\n\r" ); + if( debug_uart3 && !( from_eth ) ) pc.printf( "\n\rTCP don't drop mode on\n\r" ); if( from_eth ){ snprintf( debug_buf, __PROMPT_ETH_BUFFER_SIZE__, "TCP don't drop mode on\n\r" ); debug_buf[ strlen( debug_buf ) - 1 ] = '\0'; @@ -1261,7 +1260,7 @@ } if (xmemmatch( (uint8_t*)(debug_buf + 10 ), (uint8_t*) "off",3 )) { miss_match = false; - if( debug_uart3 ) pc.printf( "\n\rTCP don't drop mode off\n\r" ); + if( debug_uart3 && !( from_eth ) ) pc.printf( "\n\rTCP don't drop mode off\n\r" ); if( from_eth ){ snprintf( debug_buf, __PROMPT_ETH_BUFFER_SIZE__, "TCP don't drop mode off\n\r" ); debug_buf[ strlen( debug_buf ) - 1 ] = '\0'; @@ -1273,7 +1272,7 @@ else if( xmemmatch( (uint8_t*)debug_buf, (uint8_t*) "daging ",7 ) ){ if (xmemmatch( (uint8_t*)(debug_buf + 7 ), (uint8_t*) "on", 2 ) ){ miss_match = false; - if( debug_uart3 ) pc.printf( "\n\rAging Debug ON\n\r" ); + if( debug_uart3 && !( from_eth ) ) pc.printf( "\n\rAging Debug ON\n\r" ); if( from_eth ){ snprintf( debug_buf, __PROMPT_ETH_BUFFER_SIZE__, "Aging Debug On\n\r" ); debug_buf[ strlen( debug_buf ) - 1 ] = '\0'; @@ -1282,7 +1281,7 @@ } if (xmemmatch( (uint8_t*)(debug_buf + 7 ), (uint8_t*) "off",3 )) { miss_match = false; - if( debug_uart3 ) pc.printf( "\n\rAging Debug OFF\n\r" ); + if( debug_uart3 && !( from_eth ) ) pc.printf( "\n\rAging Debug OFF\n\r" ); if( from_eth ){ snprintf( debug_buf, __PROMPT_ETH_BUFFER_SIZE__, "Aging Debug Off\n\r" ); debug_buf[ strlen( debug_buf ) - 1 ] = '\0'; @@ -1294,7 +1293,7 @@ else if( xmemmatch( (uint8_t*)debug_buf, (uint8_t*) "dcpld ", 6 ) ){ if (xmemmatch( (uint8_t*)(debug_buf + 6 ), (uint8_t*) "on", 2 ) ){ miss_match = false; - if( debug_uart3 ) pc.printf( "\n\rDCPLD Debug ON\n\r" ); + if( debug_uart3 && !( from_eth ) ) pc.printf( "\n\rDCPLD Debug ON\n\r" ); if( from_eth ){ snprintf( debug_buf, __PROMPT_ETH_BUFFER_SIZE__, "DCPLD Debug On\n\r" ); debug_buf[ strlen( debug_buf ) - 1 ] = '\0'; @@ -1303,7 +1302,7 @@ } if (xmemmatch( (uint8_t*)(debug_buf + 6 ), (uint8_t*) "off",3 ) ){ miss_match = false; - if( debug_uart3 ) pc.printf( "\n\rDCPLD Debug OFF\n\r" ); + if( debug_uart3 && !( from_eth ) ) pc.printf( "\n\rDCPLD Debug OFF\n\r" ); if( from_eth ){ snprintf( debug_buf, __PROMPT_ETH_BUFFER_SIZE__, "DCPLD Debug Off\n\r" ); debug_buf[ strlen( debug_buf ) - 1 ] = '\0'; @@ -1315,7 +1314,7 @@ else if( xmemmatch( (uint8_t*)debug_buf, (uint8_t*) "dcks_err ", 9 ) ){ if (xmemmatch( (uint8_t*)(debug_buf + 9 ), (uint8_t*) "on", 2 ) ){ miss_match = false; - if( debug_uart3 ) pc.printf( "\n\rCKS_ERR Debug ON\n\r" ); + if( debug_uart3 && !( from_eth ) ) pc.printf( "\n\rCKS_ERR Debug ON\n\r" ); if( from_eth ){ snprintf( debug_buf, __PROMPT_ETH_BUFFER_SIZE__, "CKS_ERR Debug On\n\r" ); debug_buf[ strlen( debug_buf ) - 1 ] = '\0'; @@ -1324,7 +1323,7 @@ } if (xmemmatch( (uint8_t*)(debug_buf + 9 ), (uint8_t*) "off", 3 ) ){ miss_match = false; - if( debug_uart3 ) pc.printf( "\n\rCKS_ERR Debug OFF\n\r" ); + if( debug_uart3 && !( from_eth ) ) pc.printf( "\n\rCKS_ERR Debug OFF\n\r" ); if( from_eth ){ snprintf( debug_buf, __PROMPT_ETH_BUFFER_SIZE__, "CKS_ERR Debug Off\n\r" ); debug_buf[ strlen( debug_buf ) - 1 ] = '\0'; @@ -1336,7 +1335,7 @@ else if( xmemmatch( (uint8_t*)debug_buf, (uint8_t*) "dinvite ", 8 ) ){ if( xmemmatch( (uint8_t*)(debug_buf + 8 ), (uint8_t*) "on", 2 ) ){ miss_match = false; - if( debug_uart3 ) pc.printf( "\n\rInvite Debug ON\n\r" ); + if( debug_uart3 && !( from_eth ) ) pc.printf( "\n\rInvite Debug ON\n\r" ); if( from_eth ){ snprintf( debug_buf, __PROMPT_ETH_BUFFER_SIZE__, "Invite Debug On\n\r" ); debug_buf[ strlen( debug_buf ) - 1 ] = '\0'; @@ -1345,7 +1344,7 @@ } if( xmemmatch( (uint8_t*)(debug_buf + 8 ), (uint8_t*) "off",3 )) { miss_match = false; - if( debug_uart3 ) pc.printf( "\n\rInvite Debug OFF\n\r" ); + if( debug_uart3 && !( from_eth ) ) pc.printf( "\n\rInvite Debug OFF\n\r" ); if( from_eth ){ snprintf( debug_buf, __PROMPT_ETH_BUFFER_SIZE__, "Invite Debug Off\n\r" ); debug_buf[ strlen( debug_buf ) - 1 ] = '\0'; @@ -1357,7 +1356,7 @@ else if( xmemmatch( (uint8_t*)debug_buf, (uint8_t*) "dparallel ", 10 ) ){ if( xmemmatch( ( uint8_t * )( debug_buf + 10 ), ( uint8_t * )"on", 2 ) ){ miss_match = false; - if( debug_uart3 ) pc.printf( "\n\rParallel Write Debug ON\n\r" ); + if( debug_uart3 && !( from_eth ) ) pc.printf( "\n\rParallel Write Debug ON\n\r" ); if( from_eth ){ snprintf( debug_buf, __PROMPT_ETH_BUFFER_SIZE__, "\n\rParallel Write Debug ON\n\r" ); debug_buf[ strlen( debug_buf ) - 1 ] = '\0'; @@ -1366,7 +1365,7 @@ } if( xmemmatch( ( uint8_t * )( debug_buf + 10 ), ( uint8_t *)"off", 3 )) { miss_match = false; - if( debug_uart3 ) pc.printf( "\n\rParallel Write Debug OFF\n\r" ); + if( debug_uart3 && !( from_eth ) ) pc.printf( "\n\rParallel Write Debug OFF\n\r" ); if( from_eth ){ snprintf( debug_buf, __PROMPT_ETH_BUFFER_SIZE__, "\n\rParallel Write Debug OFF\n\r" ); debug_buf[ strlen( debug_buf ) - 1 ] = '\0'; @@ -1378,7 +1377,7 @@ else if( xmemmatch( (uint8_t*)debug_buf, (uint8_t*) "dtelos ", 7 ) ){ if (xmemmatch( (uint8_t*)( debug_buf + 7 ), (uint8_t*) "on", 2 ) ){ miss_match = false; - if( debug_uart3 ) pc.printf( "\n\rTelemetry Debug ON\n\r" ); + if( debug_uart3 && !( from_eth ) ) pc.printf( "\n\rTelemetry Debug ON\n\r" ); if( from_eth ){ snprintf( debug_buf, __PROMPT_ETH_BUFFER_SIZE__, "\rTelemetry Debug On\n\r" ); debug_buf[ strlen( debug_buf ) - 1 ] = '\0'; @@ -1387,7 +1386,7 @@ } if (xmemmatch( (uint8_t*)(debug_buf + 7 ), (uint8_t*) "off", 3 )) { miss_match = false; - if( debug_uart3 ) pc.printf( "\n\rTelemetry Debug OFF\n\r" ); + if( debug_uart3 && !( from_eth ) ) pc.printf( "\n\rTelemetry Debug OFF\n\r" ); if( from_eth ){ snprintf( debug_buf, __PROMPT_ETH_BUFFER_SIZE__, "\rTelemetry Debug Off\n\r" ); debug_buf[ strlen( debug_buf ) - 1 ] = '\0'; @@ -1399,7 +1398,7 @@ else if( xmemmatch( (uint8_t*)debug_buf, (uint8_t*) "dcks ", 5 ) ){ if (xmemmatch( (uint8_t*)(debug_buf + 5 ), (uint8_t*) "on",2 ) ){ miss_match = false; - if( debug_uart3 ) pc.printf( "\n\rCKS Debug ON\n\r" ); + if( debug_uart3 && !( from_eth ) ) pc.printf( "\n\rCKS Debug ON\n\r" ); if( from_eth ){ snprintf( debug_buf, __PROMPT_ETH_BUFFER_SIZE__, "CKS Debug On\n\r" ); debug_buf[ strlen( debug_buf ) - 1 ] = '\0'; @@ -1408,7 +1407,7 @@ } if (xmemmatch( (uint8_t*)(debug_buf + 5 ), (uint8_t*) "off",3 )) { miss_match = false; - if( debug_uart3 ) pc.printf( "\n\rCKS Debug OFF\n\r" ); + if( debug_uart3 && !( from_eth ) ) pc.printf( "\n\rCKS Debug OFF\n\r" ); if( from_eth ){ snprintf( debug_buf, __PROMPT_ETH_BUFFER_SIZE__, "CKS Debug Off\n\r" ); debug_buf[ strlen( debug_buf ) - 1 ] = '\0'; @@ -1440,23 +1439,24 @@ strcpy( promptcb_last_cmd, cmd ); strcat( cmd, "\r\r\r\n" ); - if( debug_uart3 ) pc.printf("\r\next=%d port=%d cmd=%s", ext, port, cmd ); + if( debug_uart3 && !( from_eth ) ) pc.printf("\r\next=%d port=%d cmd=%s", ext, port, cmd ); send2callboxes( __build_cb_package__( ext, port, __PROMPT__, cmd, id_msg++, __CB_BUFFER_SIZE__ - __VZ_HEADER_OFFSET__, write_buffer ) ); - if( debug_uart3 ) pc.printf("\n\rComando enviado"); + if( debug_uart3 && !( from_eth ) ) pc.printf("\n\rComando enviado"); if( from_eth ){ char eth_msg[ 512 ]; snprintf( eth_msg, 512 - 1, "\r\next=%d port=%d cmd=%s\r\nComando enviado\n\r", ext, port, cmd ); if( tcp_session ){ tcp_client.send_all( eth_msg, strlen( eth_msg ) ); - }else if( udp_request ){ - udp_server.sendTo( udp_client, eth_msg, strlen( eth_msg ) ); + }else if( udp_request ) + { + udp_request_send_msg( eth_msg ); } } debug_buf = ref; bufptr = 0; - for( uint8_t i = 0; i < DEBUGBUFSIZE; i++ ) debug_buf[ i ] = 0; + for( register int i = 0; i < DEBUGBUFSIZE; i++ ) debug_buf[ i ] = 0; } else if( xmemmatch( (uint8_t*)debug_buf, (uint8_t*) "bye ", 4 ) ){ @@ -1473,23 +1473,24 @@ ext = atoi( split ); port = convert_ext_to_port( ext ); - if( debug_uart3 ) pc.printf("\r\next=%d port=%d request bye", ext, port ); + if( debug_uart3 && !( from_eth ) ) pc.printf("\r\next=%d port=%d request bye", ext, port ); send2callboxes( __build_cb_package__( ext, port, __CB_BYE__, (char * )data, 0x20, __CB_BUFFER_SIZE__ - __VZ_HEADER_OFFSET__, write_buffer ) ); - if( debug_uart3 ) pc.printf("\n\rBye enviado"); + if( debug_uart3 && !( from_eth ) ) pc.printf("\n\rBye enviado"); if( from_eth ){ char eth_msg[ 512 ]; snprintf( eth_msg, 512 - 1, "\r\next=%d port=%d request bye\n\r", ext, port ); if( tcp_session ){ tcp_client.send_all( eth_msg, strlen( eth_msg ) ); - }else if( udp_request ){ - udp_server.sendTo( udp_client, eth_msg, strlen( eth_msg ) ); + }else if( udp_request ) + { + udp_request_send_msg( eth_msg ); } } debug_buf = ref; bufptr = 0; - for( uint8_t i = 0; i < DEBUGBUFSIZE; i++ ) debug_buf[ i ] = 0; + for( register int i = 0; i < DEBUGBUFSIZE; i++ ) debug_buf[ i ] = 0; } //promptcb ramal porta comando @@ -1516,31 +1517,30 @@ strcpy( promptcb_last_cmd, cmd ); //strcat( cmd, "\r\r\r\n" ); - for( register uint16_t i = strlen( cmd ); i < DEBUGBUFSIZE; i++ ) cmd[ i ] = 0; + for( register int i = strlen( cmd ); i < DEBUGBUFSIZE; i++ ) cmd[ i ] = 0; //send_msg(""); //for( register uint16_t i = 0; i < DEBUGBUFSIZE; i++ ) pc.printf("%x ", cmd[ i ] ); //send_msg("\nTamanho do cmd :: %d", strlen( cmd ) ); - if( debug_uart3 ) pc.printf("\r\next=%d port=%d cmd=%s", ext, port, cmd ); + if( debug_uart3 && !( from_eth ) ) pc.printf("\r\next=%d port=%d cmd=%s", ext, port, cmd ); send2callboxes( __build_cb_package__( ext, port, __PROMPT__, cmd, id_msg++, __CB_BUFFER_SIZE__ - __VZ_HEADER_OFFSET__, write_buffer ) ); - if( debug_uart3 ) pc.printf("\n\rComando enviado"); + if( debug_uart3 && !( from_eth ) ) pc.printf("\n\rComando enviado"); if( from_eth ){ char eth_msg[ 512 ]; snprintf( eth_msg, 512 - 1, "\r\next=%d port=%d cmd=%s\r\nComando enviado\n\r", ext, port, cmd ); if( tcp_session ){ tcp_client.send_all( eth_msg, strlen( eth_msg ) ); - }else if( udp_request ){ - udp_server.sendTo( udp_client, eth_msg, strlen( eth_msg ) ); + }else if( udp_request ) + { + udp_request_send_msg( eth_msg ); } } debug_buf = ref; - //bufptr = 0; - //debug_buf[ 0 ] = 0; bufptr = 0; - for( uint8_t i = 0; i < DEBUGBUFSIZE; i++ ) debug_buf[ i ] = 0; + for( register int i = 0; i < DEBUGBUFSIZE; i++ ) debug_buf[ i ] = 0; } else if( xmemmatch( (uint8_t*)debug_buf, (uint8_t*) "pcc ", 4 )) { @@ -1568,29 +1568,30 @@ strcpy( promptcb_last_cmd, cmd ); //strcat( cmd, "\r\r\r\n" ); - for( register uint16_t i = strlen( cmd ); i < DEBUGBUFSIZE; i++ ) cmd[ i ] = 0; + for( register int i = strlen( cmd ); i < DEBUGBUFSIZE; i++ ) cmd[ i ] = 0; //send_msg(""); //for( register uint16_t i = 0; i < DEBUGBUFSIZE; i++ ) pc.printf("%x ", cmd[ i ] ); //send_msg("\nTamanho do cmd :: %d", strlen( cmd ) ); - if( debug_uart3 ) pc.printf("\r\next=%d port=%d cmd=%s", ext, port, cmd ); + if( debug_uart3 && !( from_eth ) ) pc.printf("\r\next=%d port=%d cmd=%s", ext, port, cmd ); send2callboxes( __build_cb_package__( ext, port, __PROMPT__, cmd, id_msg++, __CB_BUFFER_SIZE__ - __VZ_HEADER_OFFSET__, write_buffer ) ); - if( debug_uart3 ) pc.printf("\n\rComando enviado"); + if( debug_uart3 && !( from_eth ) ) pc.printf("\n\rComando enviado"); if( from_eth ){ char eth_msg[ 512 ]; snprintf( eth_msg, 512 - 1, "\r\next=%d port=%d cmd=%s\r\nComando enviado\n\r", ext, port, cmd ); if( tcp_session ){ tcp_client.send_all( eth_msg, strlen( eth_msg ) ); - }else if( udp_request ){ - udp_server.sendTo( udp_client, eth_msg, strlen( eth_msg ) ); + }else if( udp_request ) + { + udp_request_send_msg( eth_msg ); } } debug_buf = ref; bufptr = 0; - for( uint8_t i = 0; i < DEBUGBUFSIZE; i++ ) debug_buf[ i ] = 0; + for( register int i = 0; i < DEBUGBUFSIZE; i++ ) debug_buf[ i ] = 0; } else if( xmemmatch( (uint8_t*)debug_buf, (uint8_t*) "rush ", 5 )) { @@ -1618,24 +1619,25 @@ strcat( cmd, "\r\r\r\n" ); for( register uint8_t i = 0; i < 3; i++ ){ - if( debug_uart3 ) pc.printf("\r\next=%d port=%d cmd=%s", ext, port, cmd ); + if( debug_uart3 && !( from_eth ) ) pc.printf("\r\next=%d port=%d cmd=%s", ext, port, cmd ); send2callboxes( __build_cb_package__( ext, port, __PROMPT__, cmd, id_msg++, __CB_BUFFER_SIZE__ - __VZ_HEADER_OFFSET__, write_buffer ) ); - if( debug_uart3 ) pc.printf("\n\rComando enviado"); + if( debug_uart3 && !( from_eth ) ) pc.printf("\n\rComando enviado"); if( from_eth ){ char eth_msg[ 512 ]; snprintf( eth_msg, 512 - 1, "\r\next=%d port=%d cmd=%s\r\nComando enviado\n\r", ext, port, cmd ); if( tcp_session ){ tcp_client.send_all( eth_msg, strlen( eth_msg ) ); - }else if( udp_request ){ - udp_server.sendTo( udp_client, eth_msg, strlen( eth_msg ) ); + }else if( udp_request ) + { + udp_request_send_msg( eth_msg ); } } } debug_buf = ref; bufptr = 0; - for( uint8_t i = 0; i < DEBUGBUFSIZE; i++ ) debug_buf[ i ] = 0; + for( register int i = 0; i < DEBUGBUFSIZE; i++ ) debug_buf[ i ] = 0; } @@ -1645,9 +1647,9 @@ debug_buf[ bufptr++ ] = 0x0D; debug_buf[ bufptr++ ] = 0x00; - if( debug_uart3 ) pc.printf("\r\next=%d port=%d\r\ncmd=%s\r\n",promptcb_last_ext, promptcb_last_port, debug_buf + 4 ); + if( debug_uart3 && !( from_eth ) ) pc.printf("\r\next=%d port=%d\r\ncmd=%s\r\n",promptcb_last_ext, promptcb_last_port, debug_buf + 4 ); send2callboxes( __build_cb_package__( promptcb_last_ext, promptcb_last_port, __PROMPT__, debug_buf + 4, id_msg++, __CB_BUFFER_SIZE__ - __VZ_HEADER_OFFSET__, write_buffer ) ); - if( debug_uart3 ) pc.printf("\n\rComando enviado\n\r"); + if( debug_uart3 && !( from_eth ) ) pc.printf("\n\rComando enviado\n\r"); } else if( xmemmatch( (uint8_t*)debug_buf, (uint8_t*) "cks",3 )) { @@ -1663,7 +1665,7 @@ else if (xmemmatch( (uint8_t*)debug_buf, (uint8_t*) "debug_main ", 11 )) { if (xmemmatch( (uint8_t*)( debug_buf + 11 ), (uint8_t*) "on", 2 )) { miss_match = false; - if( debug_uart3 ) pc.printf("\r\nDebug Main ON"); + if( debug_uart3 && !( from_eth ) ) pc.printf("\r\nDebug Main ON"); if( from_eth ){ snprintf( debug_buf, __PROMPT_ETH_BUFFER_SIZE__, "Debug Main On\n\r" ); debug_buf[ strlen( debug_buf ) - 1 ] = '\0'; @@ -1672,7 +1674,7 @@ } if (xmemmatch( (uint8_t*)( debug_buf + 11 ), (uint8_t*) "off", 3 )) { miss_match = false; - if( debug_uart3 ) pc.printf("\r\nDebug Main OFF"); + if( debug_uart3 && !( from_eth ) ) pc.printf("\r\nDebug Main OFF"); if( from_eth ){ snprintf( debug_buf, __PROMPT_ETH_BUFFER_SIZE__, "Debug Main Off\n\r" ); debug_buf[ strlen( debug_buf ) - 1 ] = '\0'; @@ -1684,7 +1686,7 @@ else if (xmemmatch( (uint8_t*)debug_buf, (uint8_t*) "dout ", 5 ) ){ if (xmemmatch( (uint8_t*)( debug_buf + 5 ), (uint8_t*) "on", 2 ) ){ miss_match = false; - if( debug_uart3 ) pc.printf("\r\nOut Debug ON"); + if( debug_uart3 && !( from_eth ) ) pc.printf("\r\nOut Debug ON"); if( from_eth ){ snprintf( debug_buf, __PROMPT_ETH_BUFFER_SIZE__, "Out Debug On\n\r" ); debug_buf[ strlen( debug_buf ) - 1 ] = '\0'; @@ -1693,7 +1695,7 @@ } if (xmemmatch( (uint8_t*)( debug_buf + 5 ), (uint8_t*) "off", 3 ) ){ miss_match = false; - if( debug_uart3 ) pc.printf("\r\nOut Debug OFF"); + if( debug_uart3 && !( from_eth ) ) pc.printf("\r\nOut Debug OFF"); if( from_eth ){ snprintf( debug_buf, __PROMPT_ETH_BUFFER_SIZE__, "Out Debug Off\n\r" ); debug_buf[ strlen( debug_buf ) - 1 ] = '\0'; @@ -1705,7 +1707,7 @@ else if (xmemmatch( (uint8_t*)debug_buf, (uint8_t*) "dboot ", 6 ) ){ if (xmemmatch( (uint8_t*)( debug_buf + 6 ), (uint8_t*) "on", 2 ) ){ miss_match = false; - if( debug_uart3 ) pc.printf("\r\nBoot Debug ON"); + if( debug_uart3 && !( from_eth ) ) pc.printf("\r\nBoot Debug ON"); if( from_eth ){ snprintf( debug_buf, __PROMPT_ETH_BUFFER_SIZE__, "Boot Debug On\n\r" ); debug_buf[ strlen( debug_buf ) - 1 ] = '\0'; @@ -1714,7 +1716,7 @@ } if (xmemmatch( (uint8_t*)( debug_buf + 6 ), (uint8_t*) "off", 3 ) ){ miss_match = false; - if( debug_uart3 ) pc.printf("\r\nBoot Debug OFF"); + if( debug_uart3 && !( from_eth ) ) pc.printf("\r\nBoot Debug OFF"); if( from_eth ){ snprintf( debug_buf, __PROMPT_ETH_BUFFER_SIZE__, "Boot Debug Off\n\r" ); debug_buf[ strlen( debug_buf ) - 1 ] = '\0'; @@ -1726,7 +1728,7 @@ else if (xmemmatch( (uint8_t*)debug_buf, (uint8_t*) "dfw ", 4 ) ){ if (xmemmatch( (uint8_t*)( debug_buf + 4 ), (uint8_t*) "on", 2 ) ){ miss_match = false; - if( debug_uart3 ) pc.printf("\r\nFW Debug ON"); + if( debug_uart3 && !( from_eth ) ) pc.printf("\r\nFW Debug ON"); if( from_eth ){ snprintf( debug_buf, __PROMPT_ETH_BUFFER_SIZE__, "FW Debug On\n\r" ); debug_buf[ strlen( debug_buf ) - 1 ] = '\0'; @@ -1735,7 +1737,7 @@ } if (xmemmatch( (uint8_t*)( debug_buf + 4 ), (uint8_t*) "off", 3 ) ){ miss_match = false; - if( debug_uart3 ) pc.printf("\r\nFW Debug OFF"); + if( debug_uart3 && !( from_eth ) ) pc.printf("\r\nFW Debug OFF"); if( from_eth ){ snprintf( debug_buf, __PROMPT_ETH_BUFFER_SIZE__, "FW Debug Off\n\r" ); debug_buf[ strlen( debug_buf ) - 1 ] = '\0'; @@ -1747,7 +1749,7 @@ else if (xmemmatch( (uint8_t*)debug_buf, (uint8_t*) "dfwp ", 5 ) ){ if (xmemmatch( (uint8_t*)( debug_buf + 5 ), (uint8_t*) "on", 2 ) ){ miss_match = false; - if( debug_uart3 ) pc.printf("\r\nFWPrint Debug ON"); + if( debug_uart3 && !( from_eth ) ) pc.printf("\r\nFWPrint Debug ON"); if( from_eth ){ snprintf( debug_buf, __PROMPT_ETH_BUFFER_SIZE__, "FWPrint Debug On\n\r" ); debug_buf[ strlen( debug_buf ) - 1 ] = '\0'; @@ -1756,7 +1758,7 @@ } if (xmemmatch( (uint8_t*)( debug_buf + 5 ), (uint8_t*) "off", 3 ) ){ miss_match = false; - if( debug_uart3 ) pc.printf("\r\nFWPrint Debug OFF"); + if( debug_uart3 && !( from_eth ) ) pc.printf("\r\nFWPrint Debug OFF"); if( from_eth ){ snprintf( debug_buf, __PROMPT_ETH_BUFFER_SIZE__, "FWPrint Debug Off\n\r" ); debug_buf[ strlen( debug_buf ) - 1 ] = '\0'; @@ -1768,7 +1770,7 @@ else if (xmemmatch( (uint8_t*)debug_buf, (uint8_t*) "drx ", 4 )) { if (xmemmatch( (uint8_t*)( debug_buf + 4 ), (uint8_t*) "on",2 )) { miss_match = false; - if( debug_uart3 ) pc.printf("\tDebug Cbx Rx ON"); + if( debug_uart3 && !( from_eth ) ) pc.printf("\tDebug Cbx Rx ON"); if( from_eth ){ snprintf( debug_buf, __PROMPT_ETH_BUFFER_SIZE__, "\tDebug Cbx On Rx on\n\r" ); debug_buf[ strlen( debug_buf ) - 1 ] = '\0'; @@ -1777,7 +1779,7 @@ } if (xmemmatch( (uint8_t*)( debug_buf + 4 ), (uint8_t*) "off",3 )) { miss_match = false; - if( debug_uart3 ) pc.printf("\tDebug Cbx Rx OFF"); + if( debug_uart3 && !( from_eth ) ) pc.printf("\tDebug Cbx Rx OFF"); if( from_eth ){ snprintf( debug_buf, __PROMPT_ETH_BUFFER_SIZE__, "\tDebug Cbx Rx Off\n\r" ); debug_buf[ strlen( debug_buf ) - 1 ] = '\0'; @@ -1789,18 +1791,18 @@ else if (xmemmatch( (uint8_t*)debug_buf, (uint8_t*) "dtx ", 4 )) { if (xmemmatch( (uint8_t*)( debug_buf + 4 ), (uint8_t*) "on",2 )) { miss_match = false; - if( debug_uart3 ) pc.printf("\tDebug Cbx Rx ON"); + if( debug_uart3 && !( from_eth ) ) pc.printf("\tDebug Cbx Tx ON"); if( from_eth ){ - snprintf( debug_buf, __PROMPT_ETH_BUFFER_SIZE__, "\tDebug Cbx On Rx on\n\r" ); + snprintf( debug_buf, __PROMPT_ETH_BUFFER_SIZE__, "\tDebug Cbx On Tx on\n\r" ); debug_buf[ strlen( debug_buf ) - 1 ] = '\0'; } debug_cb_tx = true; } if (xmemmatch( (uint8_t*)( debug_buf + 4 ), (uint8_t*) "off",3 )) { miss_match = false; - if( debug_uart3 ) pc.printf("\tDebug Cbx Rx OFF"); + if( debug_uart3 && !( from_eth ) ) pc.printf("\tDebug Cbx Tx OFF"); if( from_eth ){ - snprintf( debug_buf, __PROMPT_ETH_BUFFER_SIZE__, "\tDebug Cbx Rx Off\n\r" ); + snprintf( debug_buf, __PROMPT_ETH_BUFFER_SIZE__, "\tDebug Cbx Tx Off\n\r" ); debug_buf[ strlen( debug_buf ) - 1 ] = '\0'; } debug_cb_tx = false; @@ -1810,7 +1812,7 @@ else if (xmemmatch( (uint8_t*)debug_buf, (uint8_t*) "debug_file ", 11 )) { if (xmemmatch( (uint8_t*)( debug_buf + 11 ), (uint8_t*) "on",2 )) { miss_match = false; - if( debug_uart3 ) pc.printf("\tDebug File ON"); + if( debug_uart3 && !( from_eth ) ) pc.printf("\tDebug File ON"); if( from_eth ){ snprintf( debug_buf, __PROMPT_ETH_BUFFER_SIZE__, "\tDebug File On\n\r" ); debug_buf[ strlen( debug_buf ) - 1 ] = '\0'; @@ -1819,7 +1821,7 @@ } if (xmemmatch( (uint8_t*)( debug_buf + 11 ), (uint8_t*) "off",3 )) { miss_match = false; - if( debug_uart3 ) pc.printf("Debug File OFF"); + if( debug_uart3 && !( from_eth ) ) pc.printf("Debug File OFF"); if( from_eth ){ snprintf( debug_buf, __PROMPT_ETH_BUFFER_SIZE__, "Debug File Off\n\r" ); debug_buf[ strlen( debug_buf ) - 1 ] = '\0'; @@ -1830,338 +1832,375 @@ else if( xstrmatch( (uint8_t*)debug_buf, (uint8_t*) "help" )) { miss_match = false; - if( debug_uart3 ) pc.printf("\n\r****************************PROMPT HELP******************\n\r"); + if( debug_uart3 && !( from_eth ) ) pc.printf("\n\r****************************PROMPT HELP******************\n\r"); if( from_eth ){ snprintf( debug_buf,__PROMPT_ETH_BUFFER_SIZE__, "\n\r****************************PROMPT HELP******************\n\r" ); if( tcp_session ) while( !( tcp_client.send_all( debug_buf, strlen( debug_buf ) ) ) ); else if( udp_request ){ - while( !( udp_server.sendTo( udp_client, debug_buf, strlen( debug_buf ) ) ) ); + int send = udp_server.sendTo( udp_client, debug_buf, strlen( debug_buf ) ); + + if( send != strlen( debug_buf ) ) + { + if( debug_reconnect ) send_msg("Reconnect UDP_request client"); + reconnect_prompt_udp_socket(); + miss_prompt_udp_send_pkg++; + } } } - if( debug_uart3 ) pc.printf("ifconfig - mostra o arquivo de configuracao do sistema\n\r"); + if( debug_uart3 && !( from_eth ) ) pc.printf("ifconfig - mostra o arquivo de configuracao do sistema\n\r"); if( from_eth ){ snprintf( debug_buf,__PROMPT_ETH_BUFFER_SIZE__, "ifconfig - mostra o arquivo de configuracao do sistema\n\r" ); if( tcp_session ) while( !( tcp_client.send_all( debug_buf, strlen( debug_buf ) ) ) ); - else if( udp_request ){ - udp_server.sendTo( udp_client, debug_buf, strlen( debug_buf ) ); + else if( udp_request ) + { + udp_request_send_msg( debug_buf ); } } - if( debug_uart3 ) pc.printf("dconfig - volta as configuracoes do sistema para o padrao de fabrica\n\r"); + if( debug_uart3 && !( from_eth ) ) pc.printf("dconfig - volta as configuracoes do sistema para o padrao de fabrica\n\r"); if( from_eth ){ snprintf( debug_buf,__PROMPT_ETH_BUFFER_SIZE__, "dconfig - volta as configuracoes do sistema para o padrao de fabrica\n\r" ); if( tcp_session ) while( !( tcp_client.send_all( debug_buf, strlen( debug_buf ) ) ) ); - else if( udp_request ){ - udp_server.sendTo( udp_client, debug_buf, strlen( debug_buf ) ); + else if( udp_request ) + { + udp_request_send_msg( debug_buf ); } } - if( debug_uart3 ) pc.printf("callme [ramal porta] - envia o pedido de ligacao para o callbox com o ramal e porta indicada\n\r"); + if( debug_uart3 && !( from_eth ) ) pc.printf("callme [ramal porta] - envia o pedido de ligacao para o callbox com o ramal e porta indicada\n\r"); if( from_eth ){ snprintf( debug_buf,__PROMPT_ETH_BUFFER_SIZE__, "callme [ramal porta] - envia o pedido de ligacao para o callbox com o ramal e porta indicada\n\r" ); if( tcp_session ) while( !( tcp_client.send_all( debug_buf, strlen( debug_buf ) ) ) ); - else if( udp_request ){ - udp_server.sendTo( udp_client, debug_buf, strlen( debug_buf ) ); + else if( udp_request ) + { + udp_request_send_msg( debug_buf ); } } - if( debug_uart3 ) pc.printf("pcb porta comando - envia o <comando> para o cbx <ramal> e <porta> executar\n\r"); + if( debug_uart3 && !( from_eth ) ) pc.printf("pcb porta comando - envia o <comando> para o cbx <ramal> e <porta> executar\n\r"); if( from_eth ){ snprintf( debug_buf,__PROMPT_ETH_BUFFER_SIZE__, "promptcb ramal porta comando - envia o <comando> para o cbx <ramal> e <porta> executar\n\r" ); if( tcp_session ) while( !( tcp_client.send_all( debug_buf, strlen( debug_buf ) ) ) ); - else if( udp_request ){ - udp_server.sendTo( udp_client, debug_buf, strlen( debug_buf ) ); + else if( udp_request ) + { + udp_request_send_msg( debug_buf ); } } - if( debug_uart3 ) pc.printf("format - formata o sistema de arquivos\n\r"); - //desabilitado via eth - /* - if( from_eth ){ - snprintf( debug_buf,__PROMPT_ETH_BUFFER_SIZE__, "format - formata o sistema de arquivos\n\r" ); - if( tcp_session ) tcp_client.send_all( debug_buf, strlen( debug_buf ) ); - - else if( udp_request ){ - udp_server.sendTo( udp_client, debug_buf, strlen( debug_buf ) ); - } - } - */ - if( debug_uart3 ) pc.printf("reset - resta o sistema\n\r"); + if( debug_uart3 && !( from_eth ) ) pc.printf("format - formata o sistema de arquivos\n\r"); + if( debug_uart3 && !( from_eth ) ) pc.printf("reset - resta o sistema\n\r"); if( from_eth ){ snprintf( debug_buf,__PROMPT_ETH_BUFFER_SIZE__, "reset - resta o sistema\n\r" ); if( tcp_session ) while( !( tcp_client.send_all( debug_buf, strlen( debug_buf ) ) ) ); - else if( udp_request ){ - udp_server.sendTo( udp_client, debug_buf, strlen( debug_buf ) ); + else if( udp_request ) + { + udp_request_send_msg( debug_buf ); } } - if( debug_uart3 ) pc.printf("ipset [ip] - Configura o IP da cabeceira\n\r"); + if( debug_uart3 && !( from_eth ) ) pc.printf("ipset [ip] - Configura o IP da cabeceira\n\r"); if( from_eth ){ snprintf( debug_buf,__PROMPT_ETH_BUFFER_SIZE__, "ipset [ip] - Configura o IP da cabeceira\n\r" ); if( tcp_session ) while( !( tcp_client.send_all( debug_buf, strlen( debug_buf ) ) ) ); - else if( udp_request ){ - udp_server.sendTo( udp_client, debug_buf, strlen( debug_buf ) ); + else if( udp_request ) + { + udp_request_send_msg( debug_buf ); } } - if( debug_uart3 ) pc.printf("extset [ext] - Configura a ext da cabeceira\n\r"); + if( debug_uart3 && !( from_eth ) ) pc.printf("extset [ext] - Configura a ext da cabeceira\n\r"); if( from_eth ){ snprintf( debug_buf,__PROMPT_ETH_BUFFER_SIZE__, "extset [ext] - Configura a ext da cabeceira\n\r" ); if( tcp_session ) while( !( tcp_client.send_all( debug_buf, strlen( debug_buf ) ) ) ); - else if( udp_request ){ - udp_server.sendTo( udp_client, debug_buf, strlen( debug_buf ) ); + else if( udp_request ) + { + udp_request_send_msg( debug_buf ); } } - if( debug_uart3 ) pc.printf("msipport [port] - Configura a porta SIP da cabeceira\n\r"); + if( debug_uart3 && !( from_eth ) ) pc.printf("msipport [port] - Configura a porta SIP da cabeceira\n\r"); if( from_eth ){ snprintf( debug_buf,__PROMPT_ETH_BUFFER_SIZE__, "msipport [port] - Configura a porta SIP da cabeceira\n\r" ); if( tcp_session ) while( !( tcp_client.send_all( debug_buf, strlen( debug_buf ) ) ) ); - else if( udp_request ){ - udp_server.sendTo( udp_client, debug_buf, strlen( debug_buf ) ); + else if( udp_request ) + { + udp_request_send_msg( debug_buf ); } } - if( debug_uart3 ) pc.printf("serverip [ip] - Configura o ip do servidor asterisk\n\r"); + if( debug_uart3 && !( from_eth ) ) pc.printf("serverip [ip] - Configura o ip do servidor asterisk\n\r"); if( from_eth ){ snprintf( debug_buf,__PROMPT_ETH_BUFFER_SIZE__, "serverip [ip] - Configura o ip do servidor asterisk\n\r" ); if( tcp_session ) while( !( tcp_client.send_all( debug_buf, strlen( debug_buf ) ) ) ); - else if( udp_request ){ - udp_server.sendTo( udp_client, debug_buf, strlen( debug_buf ) ); + else if( udp_request ) + { + udp_request_send_msg( debug_buf ); } } - if( debug_uart3 ) pc.printf("serextset [ext] - Configura a server ext da cabeceira\n\r"); + if( debug_uart3 && !( from_eth ) ) pc.printf("serextset [ext] - Configura a server ext da cabeceira\n\r"); if( from_eth ){ snprintf( debug_buf,__PROMPT_ETH_BUFFER_SIZE__, "serextset [ext] - Configura a server ext da cabeceira\n\r" ); if( tcp_session ) while( !( tcp_client.send_all( debug_buf, strlen( debug_buf ) ) ) ); - else if( udp_request ){ - udp_server.sendTo( udp_client, debug_buf, strlen( debug_buf ) ); + else if( udp_request ) + { + udp_request_send_msg( debug_buf ); } } - if( debug_uart3 ) pc.printf("ssport [port] - Configura a porta SIP do servidor asterisk\n\r"); + if( debug_uart3 && !( from_eth ) ) pc.printf("ssport [port] - Configura a porta SIP do servidor asterisk\n\r"); if( from_eth ){ snprintf( debug_buf,__PROMPT_ETH_BUFFER_SIZE__, "ssport [port] - Configura a porta SIP do servidor asterisk\n\r" ); if( tcp_session ) while( !( tcp_client.send_all( debug_buf, strlen( debug_buf ) ) ) ); - else if( udp_request ){ - udp_server.sendTo( udp_client, debug_buf, strlen( debug_buf ) ); + else if( udp_request ) + { + udp_request_send_msg( debug_buf ); } } - if( debug_uart3 ) pc.printf("maskset [mask] - Configura a mascara da cabeceira\n\r"); + if( debug_uart3 && !( from_eth ) ) pc.printf("maskset [mask] - Configura a mascara da cabeceira\n\r"); if( from_eth ){ snprintf( debug_buf,__PROMPT_ETH_BUFFER_SIZE__, "maskset [mask] - Configura a mascara da cabeceira\n\r" ); if( tcp_session ) while( !( tcp_client.send_all( debug_buf, strlen( debug_buf ) ) ) ); - else if( udp_request ){ - udp_server.sendTo( udp_client, debug_buf, strlen( debug_buf ) ); + else if( udp_request ) + { + udp_request_send_msg( debug_buf ); } } - if( debug_uart3 ) pc.printf("gatewayset [gateway] - Configura o gateway da cabeceira\n\r"); + if( debug_uart3 && !( from_eth ) ) pc.printf("gatewayset [gateway] - Configura o gateway da cabeceira\n\r"); if( from_eth ){ snprintf( debug_buf,__PROMPT_ETH_BUFFER_SIZE__, "gatewayset [gateway] - Configura o gateway da cabeceira\n\r" ); if( tcp_session ) while( !( tcp_client.send_all( debug_buf, strlen( debug_buf ) ) ) ); - else if( udp_request ){ - udp_server.sendTo( udp_client, debug_buf, strlen( debug_buf ) ); - } - } - if( debug_uart3 ) pc.printf("telemetry_ip - Configura o IP do servidor de telemetria\n\r"); - if( from_eth ){ - snprintf( debug_buf,__PROMPT_ETH_BUFFER_SIZE__, "telemetry_ip - Configura o IP do servidor de telemetria\n\r" ); - if( tcp_session ) while( !( tcp_client.send_all( debug_buf, strlen( debug_buf ) ) ) ); - - else if( udp_request ){ - udp_server.sendTo( udp_client, debug_buf, strlen( debug_buf ) ); - } - } - if( debug_uart3 ) pc.printf("telemetry_port - Configura a port do servidor de telemetria\n\r"); - if( from_eth ){ - snprintf( debug_buf,__PROMPT_ETH_BUFFER_SIZE__, "telemetry_port - Configura a port do servidor de telemetria\n\r" ); - if( tcp_session ) while( !( tcp_client.send_all( debug_buf, strlen( debug_buf ) ) ) ); - - else if( udp_request ){ - udp_server.sendTo( udp_client, debug_buf, strlen( debug_buf ) ); + else if( udp_request ) + { + udp_request_send_msg( debug_buf ); } } - if( debug_uart3 ) pc.printf("fw_ip - Configura o IP do servidor de fw\n\r"); + if( debug_uart3 && !( from_eth ) ) pc.printf("fw_ip - Configura o IP do servidor de fw\n\r"); if( from_eth ){ snprintf( debug_buf,__PROMPT_ETH_BUFFER_SIZE__, "fw_ip - Configura o IP do servidor de fw\n\r" ); if( tcp_session ) while( !( tcp_client.send_all( debug_buf, strlen( debug_buf ) ) ) ); - else if( udp_request ){ - udp_server.sendTo( udp_client, debug_buf, strlen( debug_buf ) ); + else if( udp_request ) + { + udp_request_send_msg( debug_buf ); } } - if( debug_uart3 ) pc.printf("fw_port - Configura a porta do servidor de fw\n\r"); + if( debug_uart3 && !( from_eth ) ) pc.printf("fw_port - Configura a porta do servidor de fw\n\r"); if( from_eth ){ snprintf( debug_buf,__PROMPT_ETH_BUFFER_SIZE__, "fw_port - Configura a porta do servidor de fw\n\r" ); if( tcp_session ) while( !( tcp_client.send_all( debug_buf, strlen( debug_buf ) ) ) ); - else if( udp_request ){ - udp_server.sendTo( udp_client, debug_buf, strlen( debug_buf ) ); + else if( udp_request ) + { + udp_request_send_msg( debug_buf ); } } - if( debug_uart3 ) pc.printf("maxext - Configura o maior ramal possivel de ser registrado nesse ramo\n\r"); + if( debug_uart3 && !( from_eth ) ) pc.printf("maxext - Configura o maior ramal possivel de ser registrado nesse ramo\n\r"); if( from_eth ){ snprintf( debug_buf,__PROMPT_ETH_BUFFER_SIZE__, "maxext - Configura o maior ramal possivel de ser registrado nesse ramo\n\r" ); if( tcp_session ) while( !( tcp_client.send_all( debug_buf, strlen( debug_buf ) ) ) ); - else if( udp_request ){ - udp_server.sendTo( udp_client, debug_buf, strlen( debug_buf ) ); + else if( udp_request ) + { + udp_request_send_msg( debug_buf ); } } - if( debug_uart3 ) pc.printf("minext - Configura o menor ramal possivel de ser registrado nesse ramo\n\r"); + if( debug_uart3 && !( from_eth ) ) pc.printf("minext - Configura o menor ramal possivel de ser registrado nesse ramo\n\r"); if( from_eth ){ snprintf( debug_buf,__PROMPT_ETH_BUFFER_SIZE__, "minext - Configura o menor ramal possivel de ser registrado nesse ramo\n\r" ); if( tcp_session ) while( !( tcp_client.send_all( debug_buf, strlen( debug_buf ) ) ) ); - else if( udp_request ){ - udp_server.sendTo( udp_client, debug_buf, strlen( debug_buf ) ); + else if( udp_request ) + { + udp_request_send_msg( debug_buf ); } } - if( debug_uart3 ) pc.printf("showcb - lista os Cbx registrados na header\n\r"); + if( debug_uart3 && !( from_eth ) ) pc.printf("showcb - lista os Cbx registrados na header\n\r"); if( from_eth ){ snprintf( debug_buf,__PROMPT_ETH_BUFFER_SIZE__, "showcb - lista os Cbx registrados na header\n\r" ); if( tcp_session ) while( !( tcp_client.send_all( debug_buf, strlen( debug_buf ) ) ) ); - else if( udp_request ){ - udp_server.sendTo( udp_client, debug_buf, strlen( debug_buf ) ); + else if( udp_request ) + { + udp_request_send_msg( debug_buf ); } } - if( debug_uart3 ) pc.printf("cks - exibe estatisticas de check sum\n\r"); + if( debug_uart3 && !( from_eth ) ) pc.printf("cks - exibe estatisticas de check sum\n\r"); if( from_eth ){ snprintf( debug_buf,__PROMPT_ETH_BUFFER_SIZE__, "cks - exibe estatisticas de check sum\n\r" ); if( tcp_session ) while( !( tcp_client.send_all( debug_buf, strlen( debug_buf ) ) ) ); - else if( udp_request ){ - udp_server.sendTo( udp_client, debug_buf, strlen( debug_buf ) ); + else if( udp_request ) + { + udp_request_send_msg( debug_buf ); } } - if( debug_uart3 ) pc.printf("reset_cks - reseta estatisticas de check sum\n\r"); + if( debug_uart3 && !( from_eth ) ) pc.printf("reset_cks - reseta estatisticas de check sum\n\r"); if( from_eth ){ snprintf( debug_buf,__PROMPT_ETH_BUFFER_SIZE__, "reset_cks - reseta estatisticas de check sum\n\r" ); if( tcp_session ) while( !( tcp_client.send_all( debug_buf, strlen( debug_buf ) ) ) ); - else if( udp_request ){ - udp_server.sendTo( udp_client, debug_buf, strlen( debug_buf ) ); + else if( udp_request ) + { + udp_request_send_msg( debug_buf ); } } - if( debug_uart3 ) pc.printf(". - executa o comando anterior novamente\n\r"); + if( debug_uart3 && !( from_eth ) ) pc.printf(". - executa o comando anterior novamente\n\r"); if( from_eth ){ snprintf( debug_buf,__PROMPT_ETH_BUFFER_SIZE__, ". - executa o comando anterior novamente\n\r" ); if( tcp_session ) while( !( tcp_client.send_all( debug_buf, strlen( debug_buf ) ) ) ); - else if( udp_request ){ - udp_server.sendTo( udp_client, debug_buf, strlen( debug_buf ) ); + else if( udp_request ) + { + udp_request_send_msg( debug_buf ); } } - if( debug_uart3 ) pc.printf("debug [on|off|show] - seleciona debugs gerais | lista de debugs \n\r"); + if( debug_uart3 && !( from_eth ) ) pc.printf("debug [on|off|show] - seleciona debugs gerais | lista de debugs \n\r"); if( from_eth ){ snprintf( debug_buf,__PROMPT_ETH_BUFFER_SIZE__, "debug [on|off|show] - seleciona debugs gerais | lista de debugs \n\r" ); if( tcp_session ) while( !( tcp_client.send_all( debug_buf, strlen( debug_buf ) ) ) ); - else if( udp_request ){ - udp_server.sendTo( udp_client, debug_buf, strlen( debug_buf ) ); + else if( udp_request ) + { + udp_request_send_msg( debug_buf ); } } - if( debug_uart3 ) pc.printf("{ flood [ on | off ] | [+|-] } - simula envio de pacotes de audio\n\r"); + if( debug_uart3 && !( from_eth ) ) pc.printf("{ flood [ on | off ] | [+|-] } - simula envio de pacotes de audio\n\r"); if( from_eth ){ snprintf( debug_buf,__PROMPT_ETH_BUFFER_SIZE__, "{ flood [ on | off ] | [+|-] } - simula envio de pacotes de audio\n\r"); if( tcp_session ) while( !( tcp_client.send_all( debug_buf, strlen( debug_buf ) ) ) ); - else if( udp_request ){ - udp_server.sendTo( udp_client, debug_buf, strlen( debug_buf ) ); + else if( udp_request ) + { + udp_request_send_msg( debug_buf ); } } - if( debug_uart3 ) pc.printf("silence <start_ext end_ext> - envia comando de flood off para os ramais no intervalo end_ext - start_ext\n\r"); + if( debug_uart3 && !( from_eth ) ) pc.printf("silence <start_ext end_ext> - envia comando de flood off para os ramais no intervalo end_ext - start_ext\n\r"); if( from_eth ){ snprintf( debug_buf,__PROMPT_ETH_BUFFER_SIZE__, "silence <start_ext end_ext> - envia comando de flood off para os ramais no intervalo end_ext - start_ext\n\r"); if( tcp_session ) while( !( tcp_client.send_all( debug_buf, strlen( debug_buf ) ) ) ); - else if( udp_request ){ - udp_server.sendTo( udp_client, debug_buf, strlen( debug_buf ) ); + else if( udp_request ) + { + udp_request_send_msg( debug_buf ); } } - if( debug_uart3 ) pc.printf("++ ext - Header flood on, ext flood on\n\r"); + if( debug_uart3 && !( from_eth ) ) pc.printf("++ ext - Header flood on, ext flood on\n\r"); if( from_eth ){ snprintf( debug_buf,__PROMPT_ETH_BUFFER_SIZE__, "++ ext - Header flood on, ext flood on\n\r"); if( tcp_session ) while( !( tcp_client.send_all( debug_buf, strlen( debug_buf ) ) ) ); - else if( udp_request ){ - udp_server.sendTo( udp_client, debug_buf, strlen( debug_buf ) ); + else if( udp_request ) + { + udp_request_send_msg( debug_buf ); } } - if( debug_uart3 ) pc.printf("-- ext - Header flood off, ext flood off\n\r"); + if( debug_uart3 && !( from_eth ) ) pc.printf("-- ext - Header flood off, ext flood off\n\r"); if( from_eth ){ snprintf( debug_buf,__PROMPT_ETH_BUFFER_SIZE__, "++ ext - Header flood on, ext flood on\n\r"); if( tcp_session ) while( !( tcp_client.send_all( debug_buf, strlen( debug_buf ) ) ) ); - else if( udp_request ){ - udp_server.sendTo( udp_client, debug_buf, strlen( debug_buf ) ); + else if( udp_request ) + { + udp_request_send_msg( debug_buf ); } } - if( debug_uart3 ) pc.printf("rx - Exibe ultimo pacote recebido dos CBx\n\r"); + if( debug_uart3 && !( from_eth ) ) pc.printf("rx - Exibe ultimo pacote recebido dos CBx\n\r"); if( from_eth ){ snprintf( debug_buf,__PROMPT_ETH_BUFFER_SIZE__, "rx - Exibe ultimo pacote recebido dos CBx\n\r"); if( tcp_session ) while( !( tcp_client.send_all( debug_buf, strlen( debug_buf ) ) ) ); - else if( udp_request ){ - udp_server.sendTo( udp_client, debug_buf, strlen( debug_buf ) ); + else if( udp_request ) + { + udp_request_send_msg( debug_buf ); } } - if( debug_uart3 ) pc.printf("tx - Exibe ultimo pacote enviado para os CBx\n\r"); + if( debug_uart3 && !( from_eth ) ) pc.printf("tx - Exibe ultimo pacote enviado para os CBx\n\r"); if( from_eth ){ snprintf( debug_buf,__PROMPT_ETH_BUFFER_SIZE__, "tx - Exibe ultimo pacote enviado para os CBx\n\r"); if( tcp_session ) while( !( tcp_client.send_all( debug_buf, strlen( debug_buf ) ) ) ); - else if( udp_request ){ - udp_server.sendTo( udp_client, debug_buf, strlen( debug_buf ) ); + else if( udp_request ) + { + udp_request_send_msg( debug_buf ); } } - if( debug_uart3 ) pc.printf("ls | status - Exibe uma lista ordenada por ext do CBx registrados na Header\n\r"); + if( debug_uart3 && !( from_eth ) ) pc.printf("ls | status - Exibe uma lista ordenada por ext do CBx registrados na Header\n\r"); if( from_eth ){ snprintf( debug_buf,__PROMPT_ETH_BUFFER_SIZE__, "ls | status - Exibe uma lista ordenada por ext do CBx registrados na Header\n\r"); if( tcp_session ) while( !( tcp_client.send_all( debug_buf, strlen( debug_buf ) ) ) ); - else if( udp_request ){ - udp_server.sendTo( udp_client, debug_buf, strlen( debug_buf ) ); + else if( udp_request ) + { + udp_request_send_msg( debug_buf ); } } - if( debug_uart3 ) pc.printf("types - Lista os types usados no protocolo de comunicacao Header -- CBx\n\r"); + if( debug_uart3 && !( from_eth ) ) pc.printf("types - Lista os types usados no protocolo de comunicacao Header -- CBx\n\r"); if( from_eth ){ snprintf( debug_buf,__PROMPT_ETH_BUFFER_SIZE__, "types - Lista os types usados no protocolo de comunicacao Header -- CBx\n\r"); if( tcp_session ) while( !( tcp_client.send_all( debug_buf, strlen( debug_buf ) ) ) ); - else if( udp_request ){ - udp_server.sendTo( udp_client, debug_buf, strlen( debug_buf ) ); + else if( udp_request ) + { + udp_request_send_msg( debug_buf ); } } - if( debug_uart3 ) pc.printf("protocol - Exibe formato do pacote seguindo o protocolo de comunicacao Header -- CBx\n\r"); + if( debug_uart3 && !( from_eth ) ) pc.printf("protocol - Exibe formato do pacote seguindo o protocolo de comunicacao Header -- CBx\n\r"); if( from_eth ){ snprintf( debug_buf,__PROMPT_ETH_BUFFER_SIZE__, "protocol - Exibe formato do pacote seguindo o protocolo de comunicacao Header -- CBx\n\r"); if( tcp_session ) while( !( tcp_client.send_all( debug_buf, strlen( debug_buf ) ) ) ); - else if( udp_request ){ - udp_server.sendTo( udp_client, debug_buf, strlen( debug_buf ) ); + else if( udp_request ) + { + udp_request_send_msg( debug_buf ); } } - if( debug_uart3 ) pc.printf("PROMPT VERSION: V%d\n\r",PVERSION); - //Obs :: a ultima linha nao mandamos direto pro tcp porque ela eh enviada fora desse escopo - if( from_eth ) snprintf( debug_buf,__PROMPT_ETH_BUFFER_SIZE__, "PROMPT VERSION: V%d\n\r",PVERSION); + if( debug_uart3 && !( from_eth ) ) pc.printf("PROMPT VERSION: V%d\n\r", PVERSION); + if( from_eth ) + { + snprintf( debug_buf,__PROMPT_ETH_BUFFER_SIZE__, "PROMPT VERSION: V%d\n\r", PVERSION); + if( tcp_session ) + { + while( !( tcp_client.send_all( debug_buf, strlen( debug_buf ) ) ) ); + } + else if( udp_request ) + { + udp_request_send_msg( debug_buf ); + } + } + //*------------ formatando a saida ----------------*// + if( from_eth ) + { + snprintf( debug_buf,__PROMPT_ETH_BUFFER_SIZE__, "\n\r> " ); + + if( tcp_session ) + { + while( !( tcp_client.send_all( debug_buf, strlen( debug_buf ) ) ) ); + } + else if( udp_request ) + { + udp_request_send_msg( debug_buf ); + } + } + + bufptr = 0; + last_bufptr = 0; + for( register int i = 0; i < DEBUGBUFSIZE; i++ ) debug_buf[ i ] = 0; } else if( xmemmatch( (uint8_t*)debug_buf, (uint8_t*) "callme ", 7 )){ @@ -2184,37 +2223,38 @@ cmd[ tmp + 1 ] = 0x00; strcpy( promptcb_last_cmd, cmd ); - if( debug_uart3 ) pc.printf("\r\next=%d port=%d\r\ncmd=%s\r\n", ext, port, cmd ); + if( debug_uart3 && !( from_eth ) ) pc.printf("\r\next=%d port=%d\r\ncmd=%s\r\n", ext, port, cmd ); - if( debug_uart3 ) pc.printf("\n\r--------------------------------------------------------\n\r"); - for( uint16_t i = 0; i < strlen( cmd ) ; i++ ) if( debug_uart3 ) pc.printf( "%02x ", cmd[ i ] ); + if( debug_uart3 && !( from_eth ) ) pc.printf("\n\r--------------------------------------------------------\n\r"); + for( uint16_t i = 0; i < strlen( cmd ) ; i++ ) if( debug_uart3 && !( from_eth ) ) pc.printf( "%02x ", cmd[ i ] ); send2callboxes( __build_cb_package__( ext, port, __PROMPT__, cmd, id_msg++, __CB_BUFFER_SIZE__ - __VZ_HEADER_OFFSET__, write_buffer ) ); - if( debug_uart3 ) pc.printf("\n\r--------------------------------------------------------\n\r"); + if( debug_uart3 && !( from_eth ) ) pc.printf("\n\r--------------------------------------------------------\n\r"); for( uint16_t i = 0; i < 300 ; i++ ){ - if( debug_uart3 ) pc.printf( "%02x ", write_buffer[ i ] ); - if( i != 0 && !( ( i + 1 ) % 30 ) ) if( debug_uart3 ) pc.printf("\n\r"); + if( debug_uart3 && !( from_eth ) ) pc.printf( "%02x ", write_buffer[ i ] ); + if( i != 0 && !( ( i + 1 ) % 30 ) ) if( debug_uart3 && !( from_eth ) ) pc.printf("\n\r"); } - if( debug_uart3 ) pc.printf("\n\rComando enviado\n\r"); + if( debug_uart3 && !( from_eth ) ) pc.printf("\n\rComando enviado\n\r"); if( from_eth ){ char eth_msg[ 512 ]; snprintf( eth_msg, 512 - 1, "\r\next=%d port=%d\r\ncmd=%s\r\n\n\rComando enviado\n\r", ext, port, cmd ); if( tcp_session ){ tcp_client.send_all( eth_msg, strlen( eth_msg ) ); - }else if( udp_request ){ - udp_server.sendTo( udp_client, eth_msg, strlen( eth_msg ) ); + }else if( udp_request ) + { + udp_request_send_msg( eth_msg ); } } bufptr = 0; - for( uint8_t i = 0; i < DEBUGBUFSIZE; i++ ) debug_buf[ i ] = 0; + for( register int i = 0; i < DEBUGBUFSIZE; i++ ) debug_buf[ i ] = 0; } if( miss_match ){ - if( debug_uart3 ) pc.printf("\n\r> %s: command not found\n\r", debug_buf ); + if( debug_uart3 && !( from_eth ) ) pc.printf("\n\r> %s: command not found\n\r", debug_buf ); if( from_eth ){ snprintf( debug_buf, __PROMPT_ETH_BUFFER_SIZE__, "> %s: command not found\n ", debug_buf ); //debug_buf[ strlen( debug_buf ) - 1 ] = '\0'; @@ -2228,6 +2268,11 @@ } if( b == 0x0D || bufret == 1 || bufptr > DEBUGBUFSIZE ){ bufret = 0; + + if( debug_uart3 && !( from_eth ) ) pc.putc(0x0A); + if( debug_uart3 && !( from_eth ) ) pc.putc(0x0D); + if( debug_uart3 && !( from_eth ) ) pc.printf("> "); + if( from_eth ){ from_eth = false; @@ -2240,9 +2285,7 @@ tcp_client.send_all( debug_buf, strlen( debug_buf ) ); }else if( udp_request ){ - - int sent = udp_server.sendTo( udp_client, debug_buf, strlen( debug_buf ) ); - + udp_request_send_msg( debug_buf ); udp_request = false; } for( register uint16_t i = 0; i < __PROMPT_ETH_BUFFER_SIZE__; i++ ) eth_buffer[ i ] = 0; @@ -2250,11 +2293,9 @@ bufptr = last_bufptr; }else{ bufptr = 0; - for( uint8_t i = 0; i < DEBUGBUFSIZE; i++ ) debug_buf[ i ] = 0; + last_bufptr = 0; + for( register int i = 0; i < DEBUGBUFSIZE; i++ ) debug_buf[ i ] = 0; } - pc.putc(0x0A); - pc.putc(0x0D); - if( debug_uart3 ) pc.printf("> "); } return( NULL ); } \ No newline at end of file