adrian/avr-webee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

define more commands & refactor

Browse Source
This commit is contained in:
Adrian Marquis
2023-10-16 18:42:52 +02:00
parent 233537f559
commit 84689485db
2 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/main.rs
View File

@@ -3,17 +3,13 @@
mod webee; mod webee;
use core::fmt::Debug;
use webee::Webee; use webee::Webee;
use crate::webee::SendCmd::{Baudrate, Channel, MAC, PanId, Role, TransmitPower, ZigbeeNetworkKey};
use arduino_hal::Peripherals; use arduino_hal::Peripherals;
use arduino_hal::port::PinOps;
use arduino_hal::prelude::*; use arduino_hal::prelude::*;
use arduino_hal::usart::UsartOps;
use ufmt::uDisplay;
use panic_halt as _; use panic_halt as _;
use crate::webee::SendCmd::{Baudrate, Channel, MAC, PanId, Role, TransmitPower};
#[arduino_hal::entry] #[arduino_hal::entry]
@@ -21,7 +17,6 @@ fn main() -> ! {
let dp = Peripherals::take().unwrap(); let dp = Peripherals::take().unwrap();
let pins = arduino_hal::pins!(dp); let pins = arduino_hal::pins!(dp);
let _status = pins.d13.into_output(); 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 serial = arduino_hal::default_serial!(dp, pins, 57600);
let mut webee = Webee::new( 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 command_string = cmd.to_str();
let response = webee.send_cmd(cmd); let response = webee.send_cmd(cmd);
ufmt::uwrite!(&mut serial, "{}:", command_string).void_unwrap(); ufmt::uwrite!(&mut serial, "{}:", command_string).void_unwrap();
for i in 0..response.len() { 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 { 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(); ufmt::uwriteln!(&mut serial, "Got {:X}!", b).void_unwrap();
} }

6
src/webee.rs
View File

@@ -5,10 +5,7 @@ use arduino_hal::port::mode::{Input, Output};
use arduino_hal::usart::{Usart, UsartOps}; use arduino_hal::usart::{Usart, UsartOps};
use arduino_hal::prelude::*; use arduino_hal::prelude::*;
use heapless::{String, Vec}; use heapless::Vec;
// mod simple_vector;
// pub use simple_vector::SimpleVec;
pub struct Webee<USART: UsartOps<Atmega, RX, TX>, RX, TX> pub struct Webee<USART: UsartOps<Atmega, RX, TX>, RX, TX>
@@ -41,6 +38,7 @@ impl SendCmd where {
SendCmd::Baudrate => "Baudrate", SendCmd::Baudrate => "Baudrate",
SendCmd::TransmitPower => "Transmit Power", SendCmd::TransmitPower => "Transmit Power",
SendCmd::MAC => "MAC", SendCmd::MAC => "MAC",
SendCmd::ZigbeeNetworkKey => "Zigbee Network Key",
_ => "not_implemented" _ => "not_implemented"
} }
} }