diff --git a/services/shellchat/src/cmds/wlan.rs b/services/shellchat/src/cmds/wlan.rs index c4842933e..75c91637c 100644 --- a/services/shellchat/src/cmds/wlan.rs +++ b/services/shellchat/src/cmds/wlan.rs @@ -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), }; diff --git a/services/status/src/wifi.rs b/services/status/src/wifi.rs index 1d2b91725..8c12f010f 100644 --- a/services/status/src/wifi.rs +++ b/services/status/src/wifi.rs @@ -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();