From 54edb154f9e5df8f3cd72db9413e7680e17606a0 Mon Sep 17 00:00:00 2001
From: Thorsten von Eicken <tve@rightscale.com>
Date: Sat, 1 Aug 2015 21:38:56 -0700
Subject: [PATCH] added wifi channel to display info

---
 html/home.html      | 2 ++
 html/wifi/wifi.html | 1 +
 user/cgiwifi.c      | 5 +++--
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/html/home.html b/html/home.html
index 64d80e1..f16a0e0 100644
--- a/html/home.html
+++ b/html/home.html
@@ -31,9 +31,11 @@
 					<div id="wifi-spinner" class="spinner spinner-small"></div>
 					<table id="wifi-table" class="pure-table pure-table-horizontal" hidden><tbody>
 					<tr><td>WiFi mode</td><td id="wifi-mode"></td></tr>
+					<tr><td>Wifi channel</td><td id="wifi-chan"></td></tr>
 					<tr><td>Configured network</td><td id="wifi-ssid"></td></tr>
 					<tr><td>Wifi status</td><td id="wifi-status"></td></tr>
 					<tr><td>Wifi address</td><td id="wifi-ip"></td></tr>
+					<tr><td>Configured hostname</td><td id="wifi-hostname"></td></tr>
 					</tbody> </table>
 				</div></div>
 				<div class="pure-u-1 pure-u-md-1-2"><div class="card">
diff --git a/html/wifi/wifi.html b/html/wifi/wifi.html
index d556b57..b6c142b 100644
--- a/html/wifi/wifi.html
+++ b/html/wifi/wifi.html
@@ -10,6 +10,7 @@
           <div id="wifi-spinner" class="spinner spinner-small"></div>
           <table id="wifi-table" class="pure-table pure-table-horizontal" hidden><tbody>
           <tr><td>WiFi mode</td><td id="wifi-mode"></td></tr>
+					<tr><td>Wifi channel</td><td id="wifi-chan"></td></tr>
           <tr><td>Configured network</td><td id="wifi-ssid"></td></tr>
           <tr><td>Wifi status</td><td id="wifi-status"></td></tr>
           <tr><td>Wifi address</td><td id="wifi-ip"></td></tr>
diff --git a/user/cgiwifi.c b/user/cgiwifi.c
index 50d824f..7292aa4 100644
--- a/user/cgiwifi.c
+++ b/user/cgiwifi.c
@@ -485,12 +485,13 @@ int ICACHE_FLASH_ATTR printWifiInfo(char *buff) {
 	if (rssi > 0) rssi = 0;
 	uint8 mac_addr[6];
 	wifi_get_macaddr(0, mac_addr);
+	uint8_t chan = wifi_get_channel();
 
 	len = os_sprintf(buff,
 		"\"mode\": \"%s\", \"modechange\": \"%s\", \"ssid\": \"%s\", \"status\": \"%s\", \"phy\": \"%s\", "
-		"\"rssi\": \"%ddB\", \"warn\": \"%s\", \"mac\":\"%02x:%02x:%02x:%02x:%02x:%02x\"",
+		"\"rssi\": \"%ddB\", \"warn\": \"%s\", \"mac\":\"%02x:%02x:%02x:%02x:%02x:%02x\", \"chan\":%d",
 		mode, MODECHANGE, (char*)stconf.ssid, status, phy, rssi, warn,
-		mac_addr[0], mac_addr[1], mac_addr[2], mac_addr[3], mac_addr[4], mac_addr[5]);
+		mac_addr[0], mac_addr[1], mac_addr[2], mac_addr[3], mac_addr[4], mac_addr[5], chan);
 
 	struct ip_info info;
 	if (wifi_get_ip_info(0, &info)) {