mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-15 08:30:02 +00:00
fix #337
Adds MAC display to preference dialog box also offer both hex and decimal formatting outputs on wlan status
This commit is contained in:
parent
2bb58bb63f
commit
f4fabc3f8e
2 changed files with 4 additions and 3 deletions
|
|
@ -152,8 +152,8 @@ impl<'a> ShellCmdApi<'a> for Wlan {
|
|||
"status" => {
|
||||
let _ = match env.com.wlan_status() {
|
||||
Ok(msg) => {
|
||||
log::info!("{}WLAN.STATUS,{:x?},{}", xous::BOOKEND_START, std::net::IpAddr::from(msg.ipv4.addr), xous::BOOKEND_END);
|
||||
write!(ret, "{:x?}", msg)
|
||||
log::info!("{}WLAN.STATUS,{:?},{}", xous::BOOKEND_START, std::net::IpAddr::from(msg.ipv4.addr), xous::BOOKEND_END);
|
||||
write!(ret, "{:?}\n{:x?}", msg, msg)
|
||||
},
|
||||
Err(e) => write!(ret, "Error: {:?}", e),
|
||||
};
|
||||
|
|
|
|||
|
|
@ -286,7 +286,7 @@ impl WLANMan {
|
|||
// TODO: make a proper translation for this. But, I think for now, this is a fairly
|
||||
// technical screen that we can leave in English.
|
||||
let status_str = format!(
|
||||
"Connection status: \n\n ▪ SSID: {}\n ▪ Link state: {:?}\n ▪ IP: {}\n ▪ Gateway: {}\n ▪ Subnet mask: {}\n ▪ DNS 1: {}\n ▪ DNS 2: {}\n ▪ DHCP state: {:?}",
|
||||
"Connection status: \n\n ▪ SSID: {}\n ▪ Link state: {:?}\n ▪ IP: {}\n ▪ Gateway: {}\n ▪ Subnet mask: {}\n ▪ DNS 1: {}\n ▪ DNS 2: {}\n ▪ DHCP state: {:?}\n ▪ MAC: {:x?}",
|
||||
ssid,
|
||||
ls,
|
||||
format_ip(ip.addr),
|
||||
|
|
@ -295,6 +295,7 @@ impl WLANMan {
|
|||
format_ip(ip.dns1),
|
||||
format_ip(ip.dns2),
|
||||
ip.dhcp,
|
||||
ip.mac
|
||||
);
|
||||
|
||||
self.modals.show_notification(&status_str, None).unwrap();
|
||||
|
|
|
|||
Loading…
Reference in a new issue