Diff: debug.h

Revision:

105:a930035b6556

Parent:

104:62646ef786a3

Child:

106:a34fcf9f0e02

--- a/debug.h	Wed Feb 25 18:44:11 2015 +0000
+++ b/debug.h	Tue Mar 10 18:10:57 2015 +0000
@@ -34,7 +34,6 @@
 extern bool sizes;
 
 extern bool debug_reconnect;
-extern bool reconnect_stats;
 extern uint16_t miss_debug_fw_send_pkg;
 extern uint16_t miss_sip_registry_send_pkg;
 extern uint16_t miss_sip_invite_send_pkg;
@@ -44,6 +43,9 @@
 extern uint16_t miss_sip_rcv_bye_send_pkg;
 extern uint16_t miss_wdt_send_pkg;
 extern uint16_t miss_sip_inc_pkg;
+extern uint16_t miss_udp_prompt_send_pkg;
+
+extern bool show_uptime;
 
 extern bool debug_sip;
 ///< Variável de controle que ativa o debug sip.
@@ -61,8 +63,6 @@
 ///< Variável de controle que ativa o debug dos pacotes recebidos do CBx.
 extern bool debug_cb_tx;
 ///< Variável de controle que ativa o debug dos pacotes enviados para o CBx.
-extern bool debug_cb_tx;
-///< Variável de controle que ativa o debug dos pacotes enviados para o CBx.
 extern bool debug_eth_rx;
 ///< Variável de controle que ativa o debug dos pacotes recebidos da eth \note não implementado.
 extern bool debug_eth_tx;
@@ -86,6 +86,7 @@
 extern bool debug_muted;
 
 extern bool debug_cpld;
+extern bool debug_show_cpld;
 extern bool debug_cks_err;
 extern bool debug_ping;
 extern bool debug_refresh;
@@ -99,12 +100,17 @@
 //extern bool debug_registry_rcv;
 extern bool debug_port_match;
 extern bool debug_fw;
+extern bool debug_gp;
+extern bool missed_send_udp_pkg;
 
 extern bool debug_boot;
 extern bool debug_fw_print;
 extern bool debug_uart3;
 extern bool big_bug_pkg;
 extern bool flood_bug_pkg;
+extern uint16_t miss_ftp_udp_send_pkg;
+extern bool reset_missed_send_udp_pkg;
+extern bool debug_missed;
 
 /**
  * @Synopsis Função usada anteriormente para formatação da string que debug, não esta mais em uso.
@@ -120,15 +126,17 @@
   sprintf(debug_msg1, "%s:%d ", __FILE__, __LINE__); \
   sprintf(debug_msg2, __VA_ARGS__); \
   strcat(debug_msg1, debug_msg2); \
-  if( debug_uart3 ) pc.printf( "%s\n\r> ", debug_msg1 ); \
-  if( tcp_session ){ \
+  if( debug_uart3  && !udp_query && !from_eth  ) pc.printf( "%s\n\r> ", debug_msg1 ); \
+  if( tcp_session && !udp_query ){ \
     strcat( debug_msg1, "\n\r" ); \
     while( !( tcp_client.send_all( debug_msg1, strlen( debug_msg1 ) ) ) ); \
-  }else if( udp_request ){ \
-    int send = udp_server.sendTo( udp_client, debug_msg1, strlen( debug_msg1 ) ); \
+  } \
+  if( udp_query ){ \
+    strcat( debug_msg1, "\n\r" ); \
+    int send = udp_client.sendTo( udp_server, debug_msg1, strlen( debug_msg1 ) ); \
     if( send != strlen( debug_msg1 ) ) \
     { \
-        if( debug_reconnect && debug_uart3 ) pc.printf("Reconnect UDP_request client"); \
+        if( debug_reconnect && debug_uart3 && !from_eth ) pc.printf("\r\nReconnect udp_query client"); \
         reconnect_prompt_udp_socket(); \
         miss_prompt_udp_send_pkg++; \
     } \
@@ -138,15 +146,17 @@
 #define send_msg(...) _send_msg(__VA_ARGS__)
 #define _send_msg(...) { \
   sprintf( msg_, __VA_ARGS__); \
-  if( debug_uart3 ) pc.printf( "%s\n\r> ", msg_ ); \
-  if( tcp_session ){ \
+  if( debug_uart3 && !udp_query && !from_eth ) pc.printf( "%s\n\r> ", msg_ ); \
+  if( tcp_session && !udp_query ){ \
     strcat( msg_, "\n\r> " ); \
     while( !( tcp_client.send_all( msg_, strlen( msg_ ) ) ) ); \
-  }else if( udp_request ){ \
-    int send = udp_server.sendTo( udp_client, debug_msg1, strlen( debug_msg1 ) ); \
-    if( send != strlen( debug_msg1 ) ) \
+  } \
+  if( udp_query ){ \
+    strcat( msg_, "\n\r> " ); \
+    int send = udp_client.sendTo( udp_server, msg_, strlen( msg_ ) ); \
+    if( send != strlen( msg_ ) ) \
     { \
-        if( debug_reconnect && debug_uart3 ) pc.printf ("\n\rReconnect UDP_request client\n\r"); \
+        if( debug_reconnect && debug_uart3 ) pc.printf ("\n\rReconnect udp_query client\n\r"); \
         reconnect_prompt_udp_socket(); \
         miss_prompt_udp_send_pkg++; \
     } \