Diff: vz_protocol.cpp

Revision:

100:09a23fcd3bdf

Parent:

98:43b45f26b430

Child:

101:162c28286c29

diff -r e80850c51106 -r 09a23fcd3bdf vz_protocol.cpp
--- a/vz_protocol.cpp	Mon Jan 19 18:00:42 2015 +0000
+++ b/vz_protocol.cpp	Thu Feb 12 16:42:35 2015 +0000
@@ -57,7 +57,7 @@
             t.start();
         } else {
             if (cb_buffer[0] == 0x00){
-                pc.printf("%d", t.read_us());
+                if( debug_uart3 ) pc.printf("%d", t.read_us());
                 if( tcp_session ){
                     char tmp[ 16 ];
                     sprintf( tmp, "%d", t.read_us() );
@@ -66,7 +66,7 @@
             }
             flood_cnt++;
             while (flood_cnt != cb_buffer[0]) {
-                pc.printf("0");
+                if( debug_uart3 ) pc.printf("0");
                 flood_cnt++;
                 if( tcp_session ){
                     tcp_client.send_all( "0", strlen( "0" ) );
@@ -81,21 +81,21 @@
                 }
             }
             if( ok ){
-                pc.printf("+");
+                if( debug_uart3 ) pc.printf("+");
                 if( tcp_session ){
                     tcp_client.send_all( "+", strlen( "+" ) );
                 }
             }else{
-                pc.printf("%02x",cb_buffer[0] );
-                pc.printf("#");
-                pc.printf("\n\r");
+                if( debug_uart3 ) pc.printf("%02x",cb_buffer[0] );
+                if( debug_uart3 ) pc.printf("#");
+                if( debug_uart3 ) pc.printf("\n\r");
                 if( tcp_session ){
                     char tmp[ 16 ];
                     sprintf( tmp, "%02x#\n\r", cb_buffer[ 0 ] );
                     tcp_client.send_all( tmp, strlen( tmp ) );
                 }
                 for( int i = 0; i < 300 ; i++ ){
-                    pc.printf("%x", cb_buffer[ i ]);
+                    if( debug_uart3 ) pc.printf("%x", cb_buffer[ i ]);
                     if( tcp_session ){
                         char tmp[ 16 ];
                         sprintf( tmp, "%x", cb_buffer[ i ] );
@@ -204,7 +204,12 @@
     
     for( register uint16_t i = fill; i < __CB_BUFFER_SIZE__; i++ ) pkg[ i ] = 0x00;
     
-    uint16_t cc = __checksum__( pkg, 300 );
+    pkg[ __CB_BUFFER_SIZE__ - 4 ] = 0x5a;
+    pkg[ __CB_BUFFER_SIZE__ - 3 ] = 0x56;
+    pkg[ __CB_BUFFER_SIZE__ - 2 ] = 0x5a;
+    pkg[ __CB_BUFFER_SIZE__ - 1 ] = 0xe1;
+    
+    uint16_t cc = __checksum__( pkg, __CB_BUFFER_SIZE__ );
     pkg[ 4 ] =( uint8_t )( ( cc & 0xFF00 ) >> 8) ;
     pkg[ 5 ] =( uint8_t )( cc & 0x00FF );