rust-protocol: Add GetSalt, fix decoding, derive Debug.

common/rust-protocol/src/lib.rs

@@ -7,8 +7,9 @@ use core::convert::TryInto;
 use crc16::{State, KERMIT};
 use xxtea_nostd::decrypt;
 
-#[derive(Clone)]
+#[derive(Debug, Clone)]
 pub enum Packet {
+    GetSalt,
     Salt(u64),
     Report(Report),
     GetValues(GetValues),
@@ -19,9 +20,8 @@ impl Packet {
     pub fn decrypt_and_parse(key: &[u8], data: &mut [u8]) -> Option<Packet> {
         decrypt_cbc(key, data);
         let checksummed = &data[8..];
-        let calculated_crc = State::<KERMIT>::calculate(&checksummed);
-        let crc = u16::from_le_bytes(data[30..].try_into().unwrap());
-        if crc != calculated_crc {
+        let remainder = State::<KERMIT>::calculate(&checksummed);
+        if remainder != 0 {
             return None;
         }
         Self::decode(&checksummed[..22])
@@ -33,22 +33,23 @@ impl Packet {
         // below.
         let count = data[0] >> 5;
         match type_ {
-            0 => Some(Self::Salt({
+            0 => Some(Self::GetSalt),
+            1 => Some(Self::Salt({
                 // The lowest 8 bit of the salt are the device ID and are filled in by the caller.
                 u64::from_le_bytes(data[1..9].try_into().unwrap()) << 8
             })),
-            1 => Some(Self::Report(Report::decode(count, &data[1..])?)),
-            2 => Some(Self::GetValues(GetValues::decode(count, &data[1..])?)),
-            3 => Some(Self::Values(Values::decode(count, &data[1..])?)),
+            2 => Some(Self::Report(Report::decode(count, &data[1..])?)),
+            3 => Some(Self::GetValues(GetValues::decode(count, &data[1..])?)),
+            4 => Some(Self::Values(Values::decode(count, &data[1..])?)),
             _ => None,
         }
     }
 }
 
-#[derive(Clone)]
+#[derive(Debug, Clone)]
 pub struct Report {
-    count: u8,
-    values: [Value; 8],
+    pub count: u8,
+    pub values: [Value; 8],
 }
 
 impl Report {
@@ -60,15 +61,15 @@ impl Report {
         for i in 0..count {
             report.values[i as usize] = Value::decode(&mut data)?;
         }
-        None
+        Some(report)
     }
 }
 
-#[derive(Clone)]
+#[derive(Debug, Clone)]
 pub struct GetValues {
-    count: u8,
-    location: Location,
-    types_: [ValueType; 8],
+    pub count: u8,
+    pub location: Location,
+    pub types_: [ValueType; 8],
 }
 
 impl GetValues {
@@ -78,11 +79,11 @@ impl GetValues {
     }
 }
 
-#[derive(Clone)]
+#[derive(Debug, Clone)]
 pub struct Values {
-    count: u8,
-    location: Location,
-    values: [Value; 8],
+    pub count: u8,
+    pub location: Location,
+    pub values: [Value; 8],
 }
 
 impl Values {
@@ -92,7 +93,7 @@ impl Values {
     }
 }
 
-#[derive(Clone, Copy)]
+#[derive(Debug, Clone, Copy)]
 pub enum Location {
     Livingroom,
     Bathroom,
@@ -101,7 +102,7 @@ pub enum Location {
     Balcony,
 }
 
-#[derive(Clone, Copy)]
+#[derive(Debug, Clone, Copy)]
 pub enum Value {
     Invalid,
     Time(u64),
@@ -135,7 +136,7 @@ impl Value {
     }
 }
 
-#[derive(Clone, Copy)]
+#[derive(Debug, Clone, Copy)]
 pub enum ValueType {
     Time,
     Temperature,