Diff: vz_protocol.cpp

Revision:

116:39a41ebb675c

Parent:

114:472502b31a12

Child:

117:e9facba9db27

--- a/vz_protocol.cpp	Thu Apr 23 13:57:54 2015 +0000
+++ b/vz_protocol.cpp	Thu Apr 23 20:24:09 2015 +0000
@@ -40,7 +40,7 @@
     fclose( end_ext );
 }
 
-uint8_t * __parse_vz_pkg__( int * ext, int * port, volatile uint8_t * type, uint8_t * cb_buffer ){
+uint8_t * parse_vz_pkg( int * ext, int * port, volatile uint8_t * type, uint8_t * cb_buffer ){
     uint8_t p_lsb, p_msb;
     uint8_t e_lsb, e_msb;
     
@@ -109,7 +109,7 @@
     
     uint16_t cc = ( uint16_t )cb_buffer[ 4 ] << 8 | cb_buffer[ 5 ];
     
-    uint16_t cc_calculated = __checksum__( cb_buffer, __CB_BUFFER_SIZE__ );
+    uint16_t cc_calculated = vz_checksum( cb_buffer, CB_BUFFER_SIZE );
     
     if( cc != cc_calculated ){
         if( debug_cks_err ) send_msg( "Received PKG, but -- CKS ERROR: %d ( %d )", cc_calculated, cc );
@@ -150,7 +150,7 @@
         return( cb_buffer + __VZ_HEADER_OFFSET__ );    
     }
 }
-uint8_t * __build_cb_package__( int ext, int port, uint8_t type, char * cb_buffer, uint8_t seq_num, int length,  uint8_t * pkg ){
+uint8_t * build_cb_package( int ext, int port, uint8_t type, char * cb_buffer, uint8_t seq_num, int length,  uint8_t * pkg ){
     pkg[ 0 ] = ( uint8_t )( ( ext & 0xFF00 ) >> 8 );                                                                                      
     pkg[ 1 ] = ( uint8_t )( ext & 0x00FF );                                                                                                                                                                                                                                 
     pkg[ 2 ] = ( uint8_t )( ( port & 0xFF00 ) >> 8 );                      
@@ -202,21 +202,21 @@
         fill = __VZ_HEADER_OFFSET__;
     }
     
-    for( register uint16_t i = fill; i < __CB_BUFFER_SIZE__; i++ ) pkg[ i ] = 0x00;
+    for( register uint16_t i = fill; i < CB_BUFFER_SIZE; i++ ) pkg[ i ] = 0x00;
     
-    pkg[ __CB_BUFFER_SIZE__ - 4 ] = 0x5a;
-    pkg[ __CB_BUFFER_SIZE__ - 3 ] = 0x56;
-    pkg[ __CB_BUFFER_SIZE__ - 2 ] = 0x5a;
-    pkg[ __CB_BUFFER_SIZE__ - 1 ] = 0xe1;
+    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__ );
+    uint16_t cc = vz_checksum ( pkg, CB_BUFFER_SIZE );
     pkg[ 4 ] =( uint8_t )( ( cc & 0xFF00 ) >> 8) ;
     pkg[ 5 ] =( uint8_t )( cc & 0x00FF );
     
     return pkg;
 }
 
-uint16_t __checksum__( uint8_t * buffer, size_t length ){
+uint16_t vz_checksum( uint8_t * buffer, size_t length ){
     if( !buffer ) return( 0 );
     uint16_t cc = 0x00;
     buffer[ 4 ] = buffer[ 5 ] = 0x5a;