add support for wlan commands to com server

Signed-off-by: samblenny
This commit is contained in:
Sam Blenny 2021-07-06 08:29:58 +00:00
parent 2bbb8d05b9
commit 03ad8bd2e4
4 changed files with 130 additions and 10 deletions

View file

@ -136,6 +136,27 @@ pub(crate) enum Opcode {
/// suspend/resume callback
SuspendResume,
/// wlan: make sure radio is on (reset from standby if needed)
WlanOn,
/// wlan: switch radio to lowest power standby mode
WlanOff,
/// wlan: set SSID to use for joining AP
WlanSetSSID,
/// wlan: set password to use for joining AP
WlanSetPass,
/// wlan: join AP using previously set SSID & password
WlanJoin,
/// wlan: disconnect from AP
WlanLeave,
/// wlan: get AP connection info (SSID, BSSID, signal strength)
WlanShow,
}
/// These enums indicate what kind of callback type we're sending.

View file

@ -301,6 +301,70 @@ impl Com {
}
}
}
pub fn wlan_set_on(&mut self) -> Result<xous::Result, xous::Error> {
send_message(
self.conn,
Message::new_scalar(Opcode::WlanOn.to_usize().unwrap(), 0, 0, 0, 0),
)
}
pub fn wlan_set_off(&mut self) -> Result<xous::Result, xous::Error> {
send_message(
self.conn,
Message::new_scalar(Opcode::WlanOff.to_usize().unwrap(), 0, 0, 0, 0),
)
}
pub fn wlan_set_ssid(&mut self, s: &String<1024>) -> Result<xous::Result, xous::Error> {
use core::fmt::Write;
// Enforce WPA2 length limit before passing strings on to WF200
const WPA2_SSID_MAX_LEN: usize = 32;
if s.len() > WPA2_SSID_MAX_LEN {
return Err(xous::Error::InvalidString);
}
let mut copy: String::<WPA2_SSID_MAX_LEN> = String::new();
let _ = write!(copy, "{}", s);
let buf = Buffer::into_buf(copy).or(Err(xous::Error::InternalError))?;
buf.lend(self.conn, Opcode::WlanSetSSID.to_u32().unwrap())
}
pub fn wlan_set_pass(&mut self, s: &String<1024>) -> Result<xous::Result, xous::Error> {
use core::fmt::Write;
// Enforce WPA2 length limit before passing strings on to WF200
const WPA2_PASS_MAX_LEN: usize = 63;
if s.len() > WPA2_PASS_MAX_LEN {
return Err(xous::Error::InvalidString);
}
let mut copy: String::<WPA2_PASS_MAX_LEN> = String::new();
let _ = write!(copy, "{}", s);
let buf = Buffer::into_buf(copy).or(Err(xous::Error::InternalError))?;
buf.lend(self.conn, Opcode::WlanSetPass.to_u32().unwrap())
}
pub fn wlan_join(&mut self) -> Result<xous::Result, xous::Error> {
// TODO: how to make this return success/fail status from WF200?
send_message(
self.conn,
Message::new_scalar(Opcode::WlanJoin.to_usize().unwrap(), 0, 0, 0, 0),
)
}
pub fn wlan_leave(&mut self) -> Result<xous::Result, xous::Error> {
send_message(
self.conn,
Message::new_scalar(Opcode::WlanJoin.to_usize().unwrap(), 0, 0, 0, 0),
)
}
pub fn wlan_show(&mut self) -> Result<xous::Result, xous::Error> {
// TODO: how to make this return IP, netmask, gateway, DNS server, and STA MAC?
send_message(
self.conn,
Message::new_scalar(Opcode::WlanShow.to_usize().unwrap(), 0, 0, 0, 0),
)
}
}
use core::sync::atomic::{AtomicU32, Ordering};

View file

@ -583,6 +583,37 @@ fn xmain() -> ! {
}
buffer.replace(ssid_str).unwrap();
}
Some(Opcode::WlanOn) => {
info!("TODO: implement WlanOn");
// com.txrx(ComState::WLAN_ON.verb);
}
Some(Opcode::WlanOff) => {
info!("TODO: implement WlanOff");
// com.txrx(ComState::WLAN_OFF.verb);
}
Some(Opcode::WlanSetSSID) => {
info!("TODO: implement WlanSetSSID");
// com.txrx(ComState::WLAN_SET_SSID.verb);
// ... (?)
}
Some(Opcode::WlanSetPass) => {
info!("TODO: implement WlanSetPass");
// com.txrx(ComState::WLAN_SET_PASS.verb);
// ... (?)
}
Some(Opcode::WlanJoin) => {
info!("TODO: implement WlanJoin");
// com.txrx(ComState::WLAN_JOIN.verb);
}
Some(Opcode::WlanLeave) => {
info!("TODO: implement WlanLeave");
// com.txrx(ComState::WLAN_LEAVE.verb);
}
Some(Opcode::WlanShow) => {
info!("TODO: implement WlanShow");
// com.txrx(ComState::WLAN_SHOW.verb);
// ... (?)
}
None => {error!("unknown opcode"); break},
}

View file

@ -22,7 +22,7 @@ impl<'a> ShellCmdApi<'a> for Wlan {
fn process(
&mut self,
args: String<1024>,
_env: &mut CommonEnv,
env: &mut CommonEnv,
) -> Result<Option<String<1024>>, xous::Error> {
let mut ret = String::<1024>::new();
let helpstring = "wlan [on] [off] [setssid ...] [setpass ...] [join] [leave] [show]";
@ -32,35 +32,39 @@ impl<'a> ShellCmdApi<'a> for Wlan {
if let Some(sub_cmd) = tokens.next() {
match sub_cmd {
"on" => {
//env.com.set_wlan_on().unwrap();
env.com.wlan_set_on().unwrap();
write!(ret, "wlan on").unwrap();
}
"off" => {
//env.com.set_wlan_off().unwrap();
env.com.wlan_set_off().unwrap();
write!(ret, "wlan off").unwrap();
}
"setssid" => {
let mut val = String::<1024>::new();
join_tokens(&mut val, &mut tokens);
//env.com.set_wlan_ssid(&val).unwrap();
write!(ret, "wlan setssid {}", val).unwrap();
let _ = match env.com.wlan_set_ssid(&val) {
Ok(_) => write!(ret, "wlan setssid {}", val),
Err(_) => write!(ret, "Error: ssid max len is 32"),
};
}
"setpass" => {
let mut val = String::<1024>::new();
join_tokens(&mut val, &mut tokens);
//env.com.set_wlan_pass(&val).unwrap();
write!(ret, "wlan setpass {}", val).unwrap();
let _ = match env.com.wlan_set_pass(&val) {
Ok(_) => write!(ret, "wlan setpass {}", val),
Err(_) => write!(ret, "Error: pass max len is 63"),
};
}
"join" => {
//env.com.wlan_join().unwrap();
env.com.wlan_join().unwrap();
write!(ret, "wlan join").unwrap();
}
"leave" => {
//env.com.wlan_leave().unwrap();
env.com.wlan_leave().unwrap();
write!(ret, "wlan leave").unwrap();
}
"show" => {
//env.com.wlan_show().unwrap();
env.com.wlan_show().unwrap();
write!(ret, "wlan show").unwrap();
}
_ => {