From e8de21aaf4ee61c70117fd635833f57cf04f44c3 Mon Sep 17 00:00:00 2001
From: Rick Watson <rjwats@gmail.com>
Date: Mon, 29 Apr 2019 22:15:07 +0100
Subject: [PATCH] add mac address to wifi status page

---
 interface/src/containers/WiFiStatus.js | 60 ++++++++++++++------------
 src/WiFiStatus.cpp                     |  1 +
 2 files changed, 34 insertions(+), 27 deletions(-)

diff --git a/interface/src/containers/WiFiStatus.js b/interface/src/containers/WiFiStatus.js
index 5744e74..7ab68b7 100644
--- a/interface/src/containers/WiFiStatus.js
+++ b/interface/src/containers/WiFiStatus.js
@@ -15,12 +15,13 @@ import WifiIcon from '@material-ui/icons/Wifi';
 import DNSIcon from '@material-ui/icons/Dns';
 import SettingsInputComponentIcon from '@material-ui/icons/SettingsInputComponent';
 import SettingsInputAntennaIcon from '@material-ui/icons/SettingsInputAntenna';
+import DeviceHubIcon from '@material-ui/icons/DeviceHub';
 
 import SectionContent from '../components/SectionContent';
-import { WIFI_STATUS_ENDPOINT }  from  '../constants/Endpoints';
-import { isConnected, connectionStatus, connectionStatusHighlight }  from  '../constants/WiFiConnectionStatus';
+import { WIFI_STATUS_ENDPOINT } from '../constants/Endpoints';
+import { isConnected, connectionStatus, connectionStatusHighlight } from '../constants/WiFiConnectionStatus';
 import * as Highlight from '../constants/Highlight';
-import { restComponent }  from  '../components/RestComponent';
+import { restComponent } from '../components/RestComponent';
 
 const styles = theme => ({
   ["wifiStatus_" + Highlight.IDLE]: {
@@ -52,10 +53,10 @@ class WiFiStatus extends Component {
   }
 
   dnsServers(status) {
-    if (!status.dns_ip_1){
+    if (!status.dns_ip_1) {
       return "none";
     }
-    return status.dns_ip_1 + (status.dns_ip_2 ? ','+status.dns_ip_2 : '');
+    return status.dns_ip_1 + (status.dns_ip_2 ? ',' + status.dns_ip_2 : '');
   }
 
   createListItems(data, classes) {
@@ -83,6 +84,13 @@ class WiFiStatus extends Component {
               <ListItemText primary="IP Address" secondary={data.local_ip} />
             </ListItem>
             <Divider variant="inset" component="li" />
+            <ListItem>
+              <Avatar>
+                <DeviceHubIcon />
+              </Avatar>
+              <ListItemText primary="MAC Address" secondary={data.mac_address} />
+            </ListItem>
+            <Divider variant="inset" component="li" />
             <ListItem>
               <Avatar>#</Avatar>
               <ListItemText primary="Subnet Mask" secondary={data.subnet_mask} />
@@ -109,44 +117,42 @@ class WiFiStatus extends Component {
   }
 
   renderWiFiStatus(data, classes) {
-    return  (
+    return (
       <div>
         <List>
-        {this.createListItems(data, classes)}
+          {this.createListItems(data, classes)}
         </List>
         <Button variant="contained" color="secondary" className={classes.button} onClick={this.props.loadData}>
           Refresh
         </Button>
       </div>
     );
-
   }
 
   render() {
-    const { data, fetched, errorMessage, classes }  = this.props;
-
+    const { data, fetched, errorMessage, classes } = this.props;
     return (
       <SectionContent title="WiFi Status">
         {
-         !fetched ?
-         <div>
-           <LinearProgress className={classes.fetching}/>
-           <Typography variant="display1" className={classes.fetching}>
-             Loading...
+          !fetched ?
+            <div>
+              <LinearProgress className={classes.fetching} />
+              <Typography variant="display1" className={classes.fetching}>
+                Loading...
            </Typography>
-         </div>
-       :
-        data ? this.renderWiFiStatus(data, classes)
-       :
-        <div>
-          <Typography variant="display1" className={classes.fetching}>
-            {errorMessage}
-          </Typography>
-          <Button variant="contained" color="secondary" className={classes.button} onClick={this.props.loadData}>
-            Refresh
+            </div>
+            :
+            data ? this.renderWiFiStatus(data, classes)
+              :
+              <div>
+                <Typography variant="display1" className={classes.fetching}>
+                  {errorMessage}
+                </Typography>
+                <Button variant="contained" color="secondary" className={classes.button} onClick={this.props.loadData}>
+                  Refresh
           </Button>
-        </div>
-      }
+              </div>
+        }
       </SectionContent>
     )
   }
diff --git a/src/WiFiStatus.cpp b/src/WiFiStatus.cpp
index 0070fa5..5f27c38 100644
--- a/src/WiFiStatus.cpp
+++ b/src/WiFiStatus.cpp
@@ -55,6 +55,7 @@ void WiFiStatus::wifiStatus(AsyncWebServerRequest *request) {
   root["status"] = (uint8_t) status;
   if (status == WL_CONNECTED){
     root["local_ip"] = WiFi.localIP().toString();
+    root["mac_address"] = WiFi.macAddress();
     root["rssi"] = WiFi.RSSI();
     root["ssid"] = WiFi.SSID();
     root["bssid"] = WiFi.BSSIDstr();