@@ -916,13 +916,13 @@ impl MavMessage {
916916
917917 #[ inline( always) ]
918918 fn emit_name_types ( & self ) -> ( Vec < TokenStream > , usize ) {
919- let mut encoded_payload_len : usize = 0 ;
919+ let mut encoded_payload_size : usize = 0 ;
920920 let field_toks = self
921921 . fields
922922 . iter ( )
923923 . map ( |field| {
924924 let nametype = field. emit_name_type ( ) ;
925- encoded_payload_len += field. mavtype . len ( ) ;
925+ encoded_payload_size += field. mavtype . size ( ) ;
926926
927927 let description = field. emit_description ( ) ;
928928
@@ -960,7 +960,7 @@ impl MavMessage {
960960 }
961961 } )
962962 . collect :: < Vec < TokenStream > > ( ) ;
963- ( field_toks, encoded_payload_len )
963+ ( field_toks, encoded_payload_size )
964964 }
965965
966966 /// Generate description for the given message
@@ -1077,9 +1077,9 @@ impl MavMessage {
10771077 let id = self . id ;
10781078 let name = self . name . clone ( ) ;
10791079 let extra_crc = extra_crc ( self ) ;
1080- let ( name_types, payload_encoded_len ) = self . emit_name_types ( ) ;
1080+ let ( name_types, payload_encoded_size ) = self . emit_name_types ( ) ;
10811081 assert ! (
1082- ( 1 ..=255 ) . contains( & payload_encoded_len ) ,
1082+ ( 1 ..=255 ) . contains( & payload_encoded_size ) ,
10831083 "payload length must be between 1 and 255 bytes"
10841084 ) ;
10851085
@@ -1105,7 +1105,7 @@ impl MavMessage {
11051105 }
11061106
11071107 impl #msg_name {
1108- pub const ENCODED_LEN : usize = #payload_encoded_len ;
1108+ pub const ENCODED_LEN : usize = #payload_encoded_size ;
11091109 #const_default
11101110
11111111 #[ cfg( feature = "arbitrary" ) ]
@@ -1126,7 +1126,7 @@ impl MavMessage {
11261126 const ID : u32 = #id;
11271127 const NAME : & ' static str = #name;
11281128 const EXTRA_CRC : u8 = #extra_crc;
1129- const ENCODED_LEN : usize = #payload_encoded_len ;
1129+ const ENCODED_LEN : usize = #payload_encoded_size ;
11301130
11311131 fn deser( _version: MavlinkVersion , __input: & [ u8 ] ) -> Result <Self , :: mavlink_core:: error:: ParserError > {
11321132 #deser_vars
@@ -1449,16 +1449,16 @@ impl MavType {
14491449 }
14501450 }
14511451
1452- /// Size of a given Mavtype
1453- pub fn len ( & self ) -> usize {
1452+ /// Encoded size of this MavType.
1453+ pub fn size ( & self ) -> usize {
14541454 use self :: MavType :: * ;
14551455 match self {
14561456 UInt8MavlinkVersion | UInt8 | Int8 | Char => 1 ,
14571457 UInt16 | Int16 => 2 ,
14581458 UInt32 | Int32 | Float => 4 ,
14591459 UInt64 | Int64 | Double => 8 ,
14601460 CharArray ( size) => * size,
1461- Array ( t, size) => t. len ( ) * size,
1461+ Array ( t, size) => t. size ( ) * size,
14621462 }
14631463 }
14641464
@@ -1487,7 +1487,7 @@ impl MavType {
14871487 UInt16 | Int16 => 2 ,
14881488 UInt32 | Int32 | Float => 4 ,
14891489 UInt64 | Int64 | Double => 8 ,
1490- Array ( t, _) => t. len ( ) ,
1490+ Array ( t, _) => t. size ( ) ,
14911491 }
14921492 }
14931493
0 commit comments