From ead78021d77ecf8eabd48afac0bde22b7b8d5952 Mon Sep 17 00:00:00 2001
From: Andy Killorin <37423245+Speedy6451@users.noreply.github.com>
Date: Wed, 30 Oct 2024 13:06:06 -0400
Subject: [PATCH] fixed netcode

---
 inside/src/main.rs  | 5 ++---
 outside/Cargo.lock  | 2 ++
 outside/src/main.rs | 8 ++++++--
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/inside/src/main.rs b/inside/src/main.rs
index 2fef149..684af6e 100644
--- a/inside/src/main.rs
+++ b/inside/src/main.rs
@@ -186,9 +186,8 @@ async fn main(spawner: Spawner) {
                     pwm.set_config(&c);
                 },
                 'B' => {
-                    let mut buf: [u8;8] = [0;8];
-                    buf.copy_from_slice(segs.next().unwrap());
-                    let card = u64::from_ne_bytes(buf);
+                    let buf: [u8;8] =  hex::FromHex::from_hex(segs.next().unwrap()).unwrap();
+                    let card: u64 = u64::from_ne_bytes(buf);
                     info!("card {card:#16x}");
 
                     open_door(&mut c, &mut pwm).await;
diff --git a/outside/Cargo.lock b/outside/Cargo.lock
index f60ef68..f584e62 100644
--- a/outside/Cargo.lock
+++ b/outside/Cargo.lock
@@ -730,6 +730,7 @@ source = "git+https://github.com/embassy-rs/embassy#0ede8479dc4c6a58cfab0a5d4df4
 dependencies = [
  "cfg-if",
  "critical-section",
+ "defmt",
  "embedded-io-async",
  "futures-util",
  "heapless 0.8.0",
@@ -1556,6 +1557,7 @@ dependencies = [
  "embassy-net",
  "embassy-net-wiznet",
  "embassy-rp",
+ "embassy-sync 0.6.0 (git+https://github.com/embassy-rs/embassy)",
  "embassy-time",
  "embassy-usb",
  "embassy-usb-logger",
diff --git a/outside/src/main.rs b/outside/src/main.rs
index d88c4f9..9b5bfdb 100644
--- a/outside/src/main.rs
+++ b/outside/src/main.rs
@@ -225,8 +225,12 @@ async fn main(spawner: Spawner) {
         info!("Connected to {:?}", socket.remote_endpoint());
         control.gpio_set(0, true).await;
 
-        socket.write(b"C ").await.unwrap();
-        socket.write(&card.to_ne_bytes()).await.unwrap();
+        let mut data: [u8;18] = [b' ';18];
+        data[0] = b'B';
+        data[1] = b' ';
+        hex::encode_to_slice(&card.to_ne_bytes(), &mut data[2..]).unwrap();
+
+        socket.write_all(&data).await.unwrap();
         info!("wrote to {:?}", socket.remote_endpoint());
 
         socket.close();