Changed message type from u8 to button
This commit is contained in:
@ -24,7 +24,7 @@ use ::{
|
||||
},
|
||||
core::time::Duration,
|
||||
};
|
||||
use crate::commands::Commands;
|
||||
use crate::commands::{Button, Commands};
|
||||
use async_channel::Sender;
|
||||
use log::*; //{trace, debug, info, warn, error}
|
||||
|
||||
@ -100,6 +100,14 @@ pub enum Menu{//<'a> {
|
||||
|
||||
}
|
||||
|
||||
fn input_to_button(i: u8) -> Option<Button> {
|
||||
match i {
|
||||
0 => {Some(Button::Released)}
|
||||
1 => {Some(Button::Pressed)}
|
||||
_ => {None}
|
||||
}
|
||||
}
|
||||
|
||||
pub fn process_menu(
|
||||
cli: &mut CliHandle<'_, SimpleWriter, Infallible>,
|
||||
command: Menu,//<'_>,
|
||||
@ -109,35 +117,68 @@ pub fn process_menu(
|
||||
// We ignore sending errors throughout because the Cli interface is only for
|
||||
// testing and debugging.
|
||||
Menu::PicRecvUp {data} => {
|
||||
cli.writer().write_str("Sending PicButtonUp Received command")?;
|
||||
let _ = dispatch.send_blocking(Commands::PicRecvUp{data});
|
||||
let but = input_to_button(data);
|
||||
match but {
|
||||
Some(d) => {
|
||||
println!("Sending PicRecvUp command");
|
||||
let _ = dispatch.send_blocking(Commands::PicRecvUp{data: d});
|
||||
}
|
||||
None => {println!("Incorrect value; enter 0 or 1")}
|
||||
}
|
||||
}
|
||||
Menu::PicRecvDown{data} => {
|
||||
cli.writer().write_str("Sending PicButtonDown command")?;
|
||||
let _ = dispatch.send_blocking(Commands::PicRecvDown{data});
|
||||
let but = input_to_button(data);
|
||||
match but {
|
||||
Some(d) => {
|
||||
println!("Sending PicRecvUp command");
|
||||
let _ = dispatch.send_blocking(Commands::PicRecvDown{data: d});
|
||||
}
|
||||
None => {println!("Incorrect value; enter 0 or 1")}
|
||||
}
|
||||
}
|
||||
Menu::PicRecvStop{data} => {
|
||||
cli.writer().write_str("Sending PicButtonStop command")?;
|
||||
let _ = dispatch.send_blocking(Commands::PicRecvStop{data});
|
||||
let but = input_to_button(data);
|
||||
match but {
|
||||
Some(d) => {
|
||||
println!("Sending PicRecvUp command");
|
||||
let _ = dispatch.send_blocking(Commands::PicRecvStop{data: d});
|
||||
}
|
||||
None => {println!("Incorrect value; enter 0 or 1")}
|
||||
}
|
||||
}
|
||||
Menu::PicRecvPair => {
|
||||
cli.writer().write_str("Sending PIC command and timer reset (the job of the pair button driver, once PIC interface exists)")?; //TODO: PIC get this.
|
||||
let _ = dispatch.send_blocking(Commands::AllowPairing);
|
||||
}
|
||||
Menu::BluetoothUp { data } => {
|
||||
cli.writer()
|
||||
.write_str("Sending BluetoothUp")?;
|
||||
let _ = dispatch.send_blocking(Commands::BluetoothUp { data: data });
|
||||
let but = input_to_button(data);
|
||||
match but {
|
||||
Some(d) => {
|
||||
println!("Sending PicRecvUp command");
|
||||
let _ = dispatch.send_blocking(Commands::BluetoothUp{data: d});
|
||||
}
|
||||
None => {println!("Incorrect value; enter 0 or 1")}
|
||||
}
|
||||
}
|
||||
Menu::BluetoothDown { data } => {
|
||||
cli.writer()
|
||||
.write_str("Sending BluetoothDown")?;
|
||||
let _ = dispatch.send_blocking(Commands::BluetoothDown { data: data });
|
||||
let but = input_to_button(data);
|
||||
match but {
|
||||
Some(d) => {
|
||||
println!("Sending PicRecvUp command");
|
||||
let _ = dispatch.send_blocking(Commands::BluetoothDown{data: d});
|
||||
}
|
||||
None => {println!("Incorrect value; enter 0 or 1")}
|
||||
}
|
||||
}
|
||||
Menu::BluetoothStop { data } => {
|
||||
cli.writer()
|
||||
.write_str("SendingBluetoothStop")?;
|
||||
let _ = dispatch.send_blocking(Commands::BluetoothStop { data: data });
|
||||
let but = input_to_button(data);
|
||||
match but {
|
||||
Some(d) => {
|
||||
println!("Sending PicRecvUp command");
|
||||
let _ = dispatch.send_blocking(Commands::BluetoothStop{data: d});
|
||||
}
|
||||
None => {println!("Incorrect value; enter 0 or 1")}
|
||||
}
|
||||
}
|
||||
Menu::BluetoothLearn { data } => {
|
||||
cli.writer()
|
||||
|
||||
Reference in New Issue
Block a user