mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-15 08:30:02 +00:00
some very minor ergonomic improvements around network connection UX
This commit is contained in:
parent
b498669003
commit
955d0182d6
2 changed files with 30 additions and 6 deletions
|
|
@ -20,7 +20,7 @@ pub use smoltcp::wire::Icmpv4DstUnreachable;
|
|||
|
||||
pub(crate) const SERVER_NAME_NET: &str = "_Middleware Network Server_";
|
||||
#[allow(dead_code)]
|
||||
pub const AP_DICT_NAME: &'static str = "wlan_ap_list";
|
||||
pub const AP_DICT_NAME: &'static str = "wlan.networks";
|
||||
|
||||
#[allow(dead_code)]
|
||||
/// minimum revision required for compatibility with Net crate
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ impl<'a> ShellCmdApi<'a> for Wlan {
|
|||
env: &mut CommonEnv,
|
||||
) -> Result<Option<String<1024>>, xous::Error> {
|
||||
let mut ret = String::<1024>::new();
|
||||
let helpstring = "wlan [on] [off] [setssid ...] [setpass ...] [join] [leave] [status] [save]";
|
||||
let helpstring = "wlan [on] [off] [setssid ...] [setpass ...] [join] [leave] [status] [save] [known]";
|
||||
let mut show_help = false;
|
||||
|
||||
let mut tokens = args.as_str().unwrap().split(' ');
|
||||
|
|
@ -45,14 +45,18 @@ impl<'a> ShellCmdApi<'a> for Wlan {
|
|||
Ok(_) => write!(ret, "wlan on"),
|
||||
Err(e) => write!(ret, "Error: {:?}", e),
|
||||
};
|
||||
env.netmgr.connection_manager_run().unwrap();
|
||||
}
|
||||
"off" => {
|
||||
env.netmgr.connection_manager_stop().unwrap();
|
||||
let _ = match env.com.wlan_set_off() {
|
||||
Ok(_) => write!(ret, "wlan off"),
|
||||
Err(e) => write!(ret, "Error: {:?}", e),
|
||||
};
|
||||
}
|
||||
"setssid" => {
|
||||
// stop the connection manager from running if we're setting up an AP
|
||||
env.netmgr.connection_manager_stop().unwrap();
|
||||
let mut val = String::<1024>::new();
|
||||
join_tokens(&mut val, &mut tokens);
|
||||
if val.len() == 0 {
|
||||
|
|
@ -68,6 +72,7 @@ impl<'a> ShellCmdApi<'a> for Wlan {
|
|||
}
|
||||
}
|
||||
"setpass" => {
|
||||
env.netmgr.connection_manager_stop().unwrap();
|
||||
let mut val = String::<1024>::new();
|
||||
join_tokens(&mut val, &mut tokens);
|
||||
let _ = match env.com.wlan_set_pass(val.as_str().expect("not valid utf-8")) {
|
||||
|
|
@ -95,6 +100,8 @@ impl<'a> ShellCmdApi<'a> for Wlan {
|
|||
// future we'll have a timer that automatically syncs the pddb
|
||||
entry.flush().expect("couldn't sync pddb cache");
|
||||
write!(ret, "SSID/pass combo saved to PDDB").unwrap();
|
||||
// restart the connection manager now that the key combo has been committed
|
||||
env.netmgr.connection_manager_run().unwrap();
|
||||
}
|
||||
}
|
||||
Err(e) => {
|
||||
|
|
@ -112,17 +119,34 @@ impl<'a> ShellCmdApi<'a> for Wlan {
|
|||
} else {
|
||||
write!(ret, "No SSID currently set").unwrap();
|
||||
}
|
||||
|
||||
}
|
||||
"known" => {
|
||||
let mut pddb = pddb::Pddb::new();
|
||||
match pddb.list_keys(net::AP_DICT_NAME, None) {
|
||||
Ok(list) => {
|
||||
write!(ret, "Saved network configs:\n").unwrap();
|
||||
for item in list.iter() {
|
||||
write!(ret, " {}", item).ok(); // whatever, maybe we have too many?
|
||||
}
|
||||
}
|
||||
Err(e) => {
|
||||
write!(ret, "PDDB error accessing network configs: {:?}", e).unwrap();
|
||||
}
|
||||
}
|
||||
}
|
||||
"join" => {
|
||||
let _ = match env.com.wlan_join() {
|
||||
Ok(_) => write!(ret, "wlan join"),
|
||||
Err(e) => write!(ret, "Error: {:?}", e),
|
||||
Ok(_) => {
|
||||
write!(ret, "wlan join. Connection manager started.").unwrap();
|
||||
env.netmgr.connection_manager_run().unwrap();
|
||||
},
|
||||
Err(e) => write!(ret, "Error: {:?}", e).unwrap(),
|
||||
};
|
||||
}
|
||||
"leave" => {
|
||||
env.netmgr.connection_manager_stop().unwrap();
|
||||
let _ = match env.com.wlan_leave() {
|
||||
Ok(_) => write!(ret, "wlan leave"),
|
||||
Ok(_) => write!(ret, "wlan leave. Connection manager stopped."),
|
||||
Err(e) => write!(ret, "Error: {:?}", e),
|
||||
};
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue