From 84689485db152e8293531f66f5dea8fcc90d230b Mon Sep 17 00:00:00 2001
From: Adrian Marquis <adrian@marquis.site>
Date: Mon, 16 Oct 2023 18:42:52 +0200
Subject: [PATCH] define more commands & refactor

---
 src/main.rs  | 15 +++++----------
 src/webee.rs |  6 ++----
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index 89cb10c..a0ba64e 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -3,17 +3,13 @@
 
 mod webee;
 
-use core::fmt::Debug;
 use webee::Webee;
+use crate::webee::SendCmd::{Baudrate, Channel, MAC, PanId, Role, TransmitPower, ZigbeeNetworkKey};
 
 
 use arduino_hal::Peripherals;
-use arduino_hal::port::PinOps;
 use arduino_hal::prelude::*;
-use arduino_hal::usart::UsartOps;
-use ufmt::uDisplay;
 use panic_halt as _;
-use crate::webee::SendCmd::{Baudrate, Channel, MAC, PanId, Role, TransmitPower};
 
 
 #[arduino_hal::entry]
@@ -21,7 +17,6 @@ fn main() -> ! {
     let dp = Peripherals::take().unwrap();
     let pins = arduino_hal::pins!(dp);
     let _status = pins.d13.into_output();
-    let webee_rx = pins.d2.forget_imode();
     let mut serial = arduino_hal::default_serial!(dp, pins, 57600);
 
     let mut webee = Webee::new(
@@ -34,21 +29,21 @@ fn main() -> ! {
 
     // --------------------------------
 
-    for mut cmd in [Role, PanId, Channel, Baudrate, TransmitPower, MAC] {
+    for cmd in [Role, Baudrate, PanId, Channel, TransmitPower, MAC, ZigbeeNetworkKey] {
         let command_string = cmd.to_str();
         let response = webee.send_cmd(cmd);
 
         ufmt::uwrite!(&mut serial, "{}:", command_string).void_unwrap();
         for i in 0..response.len() {
-            ufmt::uwrite!(&mut serial, " {:02X}", *response.get(i).unwrap());
+            ufmt::uwrite!(&mut serial, " {:02X}", *response.get(i).unwrap()).void_unwrap();
         }
-        ufmt::uwriteln!(&mut serial, "");
+        ufmt::uwriteln!(&mut serial, "").void_unwrap();
     }
 
     // --------------------------------
 
     loop {
-        let b = nb::block!(serial.read()).void_unwrap();
+        let b = nb::block!(serial.read()).unwrap();
 
         ufmt::uwriteln!(&mut serial, "Got {:X}!", b).void_unwrap();
     }
diff --git a/src/webee.rs b/src/webee.rs
index 4f12761..43b19aa 100644
--- a/src/webee.rs
+++ b/src/webee.rs
@@ -5,10 +5,7 @@ use arduino_hal::port::mode::{Input, Output};
 use arduino_hal::usart::{Usart, UsartOps};
 use arduino_hal::prelude::*;
 
-use heapless::{String, Vec};
-
-// mod simple_vector;
-// pub use simple_vector::SimpleVec;
+use heapless::Vec;
 
 
 pub struct Webee<USART: UsartOps<Atmega, RX, TX>, RX, TX>
@@ -41,6 +38,7 @@ impl SendCmd where {
             SendCmd::Baudrate => "Baudrate",
             SendCmd::TransmitPower => "Transmit Power",
             SendCmd::MAC => "MAC",
+            SendCmd::ZigbeeNetworkKey => "Zigbee Network Key",
             _ => "not_implemented"
         }
     }