storage: implement get card by uuid

src/card/decoder.rs

@@ -3,20 +3,20 @@ use core::fmt::Display;
 use crate::card::model::NfcPayload;
 use alloc::string::{String, ToString};
 
-pub fn split_nfc_hex(payload: &[u8]) -> Option<NfcPayload<'_>> {
+pub fn split_nfc_hex(payload: &[u8]) -> Option<NfcPayload> {
     if payload.len() < 0x35A {
         return None;
     }
 
     Some(NfcPayload {
-        event_encoding: &payload[0..2],
+        event_encoding: payload[0..2].try_into().ok()?,
         card_type: payload[2],
-        card_uuid: &payload[3..5],
-        _reserved: &payload[5..9],
-        sprite: &payload[9..0x2DB],
-        packed_card_text: &payload[0x2DB..0x311],
-        secret: &payload[0x311..0x329],
-        _opaque_trailer: &payload[0x329..0x35A],
+        card_uuid: payload[3..5].try_into().ok()?,
+        _reserved: payload[5..9].try_into().ok()?,
+        sprite: payload[9..0x2DB].try_into().ok()?,
+        packed_card_text: payload[0x2DB..0x311].try_into().ok()?,
+        secret: payload[0x311..0x329].try_into().ok()?,
+        _opaque_trailer: payload[0x329..0x35A].try_into().ok()?,
     })
 }
 

src/card/model.rs

@@ -6,16 +6,19 @@ use num_enum::FromPrimitive;
 use crate::card::decoder::{Events, decode_known_event, decode_packed_card_text, decode_secret};
 use embedded_graphics::pixelcolor::{Rgb565, Rgb888};
 
-#[derive(Debug, Clone, Copy)]
-pub struct NfcPayload<'a> {
-    pub event_encoding: &'a [u8],
+use binary_serde::BinarySerde;
+
+#[derive(Debug, BinarySerde, PartialEq, Eq, Clone, Copy)]
+#[repr(C)]
+pub struct NfcPayload {
+    pub event_encoding: [u8; 2],
     pub card_type: u8,
-    pub card_uuid: &'a [u8],
-    pub _reserved: &'a [u8],
-    pub sprite: &'a [u8],
-    pub packed_card_text: &'a [u8],
-    pub secret: &'a [u8],
-    pub _opaque_trailer: &'a [u8],
+    pub card_uuid: [u8; 2],
+    pub _reserved: [u8; 4],
+    pub sprite: [u8; 722],
+    pub packed_card_text: [u8; 54],
+    pub secret: [u8; 24],
+    pub _opaque_trailer: [u8; 49],
 }
 
 #[derive(Debug, Clone, Eq, PartialEq, FromPrimitive)]
@@ -235,15 +238,15 @@ pub struct Card {
     pub sprite: Sprite,
 }
 
-impl<'a> TryFrom<NfcPayload<'a>> for Card {
+impl<'a> TryFrom<NfcPayload> for Card {
     type Error = &'static str;
 
-    fn try_from(payload: NfcPayload<'a>) -> Result<Self, Self::Error> {
+    fn try_from(payload: NfcPayload) -> Result<Self, Self::Error> {
         let uuid: String = "empty for now".into(); //str::from_utf8(payload.card_uuid).unwrap().into();
-        let event = decode_known_event(payload.event_encoding);
+        let event = decode_known_event(&payload.event_encoding);
         let cardtype = CardType::from(payload.card_type);
-        let (name, trait1, trait2, trait3) = decode_packed_card_text(payload.packed_card_text);
-        let secret = decode_secret(payload.secret);
+        let (name, trait1, trait2, trait3) = decode_packed_card_text(&payload.packed_card_text);
+        let secret = decode_secret(&payload.secret);
         let sprite = Sprite {
             data: payload.sprite.to_vec(),
         };