Update repository to work with latest version of ping-protocol

build/main.rs

@@ -39,7 +39,11 @@ pub fn main() {
         let definition_file = entry.file_name();
         let module_name: String = definition_file.to_str().unwrap().into();
 
-        if module_name.contains("pinghf") {
+        if module_name.contains("pinghf")
+            || module_name.contains("ping1dtsr")
+            || module_name.contains("surveyor240")
+            || module_name.contains("s500")
+        {
             continue;
         }
 

build/parser.rs

@@ -21,13 +21,16 @@ struct VectorType {
 #[derive(Debug)]
 #[cfg_attr(any(test, feature = "arbitrary"), derive(arbitrary::Arbitrary))]
 enum PayloadType {
+    BOOL,
     CHAR,
     U8,
     U16,
     U32,
+    U64,
     I8,
     I16,
     I32,
+    I64,
     F32,
     F64,
     VECTOR(Box<VectorType>),
@@ -36,13 +39,16 @@ enum PayloadType {
 impl PayloadType {
     pub fn from_string(name: &str) -> Self {
         match name {
+            "bool" | "boolean" => PayloadType::BOOL,
             "char" => PayloadType::CHAR,
             "u8" | "uint8_t" => PayloadType::U8,
             "u16" | "uint16_t" => PayloadType::U16,
             "u32" | "uint32_t" => PayloadType::U32,
+            "u64" | "uint64_t" => PayloadType::U64,
             "i8" | "int8_t" => PayloadType::I8,
             "i16" | "int16_t" => PayloadType::I16,
             "i32" | "int32_t" => PayloadType::I32,
+            "i64" | "int64_t" => PayloadType::I64,
             "float" => PayloadType::F32,
             "double" => PayloadType::F64,
             "vector" => panic!("Can't convert vector with from_string."),
@@ -69,13 +75,16 @@ impl PayloadType {
 
     pub fn to_rust(&self) -> TokenStream {
         match self {
+            PayloadType::BOOL => quote! {bool},
             PayloadType::CHAR => quote! {char},
             PayloadType::U8 => quote! {u8},
             PayloadType::U16 => quote! {u16},
             PayloadType::U32 => quote! {u32},
+            PayloadType::U64 => quote! {u64},
             PayloadType::I8 => quote! {i8},
             PayloadType::I16 => quote! {i16},
             PayloadType::I32 => quote! {i32},
+            PayloadType::I64 => quote! {i64},
             PayloadType::F32 => quote! {f32},
             PayloadType::F64 => quote! {f64},
             PayloadType::VECTOR(_vector) => panic!("Can't convert vector to rust."),
@@ -84,10 +93,10 @@ impl PayloadType {
 
     pub fn to_size(&self) -> usize {
         match self {
-            PayloadType::CHAR | PayloadType::U8 | PayloadType::I8 => 1,
+            PayloadType::BOOL | PayloadType::CHAR | PayloadType::U8 | PayloadType::I8 => 1,
             PayloadType::U16 | PayloadType::I16 => 2,
             PayloadType::U32 | PayloadType::I32 | PayloadType::F32 => 4,
-            PayloadType::F64 => 8,
+            PayloadType::U64 | PayloadType::I64 | PayloadType::F64 => 8,
             PayloadType::VECTOR(_) => 0,
         }
     }
@@ -393,14 +402,14 @@ impl MessageDefinition {
             .map(|field| {
                 let name = ident!(field.name);
                 match &field.typ {
-                    PayloadType::I8 | PayloadType::U8 | PayloadType::CHAR => {
+                    PayloadType::BOOL | PayloadType::I8 | PayloadType::U8 | PayloadType::CHAR => {
                         let value = quote! {
                             #name: payload[#b].into(),
                         };
                         b += field.typ.to_size();
                         value
                     }
-                    PayloadType::U16 | PayloadType::I16 | PayloadType::U32 | PayloadType::I32 | PayloadType::F32 | PayloadType::F64 => {
+                    PayloadType::U16 | PayloadType::I16 | PayloadType::U32 | PayloadType::I32 | PayloadType::U64 | PayloadType::I64 | PayloadType::F32 | PayloadType::F64 => {
                         let data_type = field.typ.to_rust();
                         let data_size = field.typ.to_size();
                         let field_token = quote! {
@@ -419,18 +428,21 @@ impl MessageDefinition {
                             let length = self.payload.len();
                             let field_token = {
                                 let value = match vector.data_type {
+                                    PayloadType::BOOL |
                                     PayloadType::CHAR |
                                     PayloadType::U8 |
                                     PayloadType::I8 => quote! {
                                         payload[#b + #length_size..payload.len()].to_vec()
                                     },
                                     PayloadType::U16 |
                                     PayloadType::U32 |
+                                    PayloadType::U64 |
                                     PayloadType::I16 |
                                     PayloadType::I32 |
+                                    PayloadType::I64 |
                                     PayloadType::F32 |
-                                    PayloadType::F64=> quote! {
-                                        payload[#b + #length_size..payload.len()]
+                                    PayloadType::F64 => quote! {
+                                        payload[#b..payload.len()]
                                             .chunks_exact(#data_size)
                                             .into_iter()
                                             .map(|a| #data_type::from_le_bytes((*a).try_into().expect("Wrong slice length")))