From a60876378f0adc066352eb978ef07d2d54fc83f7 Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Sun, 2 Sep 2018 13:01:08 +0200
Subject: [PATCH] Show AP channel on webpage

Show channel number on webpage and wifiscan debug info. Add BSSid to wifiscan debug info
---
 sonoff/language/bg-BG.h      | 2 ++
 sonoff/language/cs-CZ.h      | 2 ++
 sonoff/language/de-DE.h      | 2 ++
 sonoff/language/el-GR.h      | 2 ++
 sonoff/language/en-GB.h      | 2 ++
 sonoff/language/es-AR.h      | 2 ++
 sonoff/language/fr-FR.h      | 2 ++
 sonoff/language/hu-HU.h      | 2 ++
 sonoff/language/it-IT.h      | 2 ++
 sonoff/language/nl-NL.h      | 2 ++
 sonoff/language/pl-PL.h      | 2 ++
 sonoff/language/pt-BR.h      | 2 ++
 sonoff/language/pt-PT.h      | 2 ++
 sonoff/language/ru-RU.h      | 2 ++
 sonoff/language/tr-TR.h      | 4 +++-
 sonoff/language/uk-UK.h      | 2 ++
 sonoff/language/zh-CN.h      | 2 ++
 sonoff/language/zh-TW.h      | 2 ++
 sonoff/xdrv_02_webserver.ino | 5 +++--
 19 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/sonoff/language/bg-BG.h b/sonoff/language/bg-BG.h
index 6421441b7..e85ab66c3 100644
--- a/sonoff/language/bg-BG.h
+++ b/sonoff/language/bg-BG.h
@@ -60,10 +60,12 @@
 #define D_BLINKOFF "Мигане изкл."
 #define D_BOOT_COUNT "Брой на стартиранията"
 #define D_BRIGHTLIGHT "Яркост"
+#define D_BSSID "BSSId"
 #define D_BUTTON "Бутон"
 #define D_BY "от"                    // Written by me
 #define D_BYTES "Байта"
 #define D_CELSIUS "Целзий"
+#define D_CHANNEL "Channel"
 #define D_CO2 "Въглероден диоксид"
 #define D_CODE "код"                // Button code
 #define D_COLDLIGHT "Хладна"
diff --git a/sonoff/language/cs-CZ.h b/sonoff/language/cs-CZ.h
index d1905c103..2f51ccc93 100644
--- a/sonoff/language/cs-CZ.h
+++ b/sonoff/language/cs-CZ.h
@@ -60,10 +60,12 @@
 #define D_BLINKOFF "BlikáníVyp"
 #define D_BOOT_COUNT "Počítadlo spuštění"
 #define D_BRIGHTLIGHT "Světlý"
+#define D_BSSID "BSSId"
 #define D_BUTTON "Tlačítko"
 #define D_BY "by"                    // Written by me
 #define D_BYTES "Bytů"
 #define D_CELSIUS "°C"
+#define D_CHANNEL "Channel"
 #define D_CO2 "CO2"
 #define D_CODE "kód"                 // Button code
 #define D_COLDLIGHT "Studené světlo"
diff --git a/sonoff/language/de-DE.h b/sonoff/language/de-DE.h
index 302c7e55e..888345d8a 100644
--- a/sonoff/language/de-DE.h
+++ b/sonoff/language/de-DE.h
@@ -60,10 +60,12 @@
 #define D_BLINKOFF "BlinkenAus"
 #define D_BOOT_COUNT "Anzahl Startvorgänge"
 #define D_BRIGHTLIGHT "hell"
+#define D_BSSID "BSSId"
 #define D_BUTTON "Knopf"
 #define D_BY "von"                   // Written by me
 #define D_BYTES "Bytes"
 #define D_CELSIUS "Celsius"
+#define D_CHANNEL "Kanal"
 #define D_CO2 "CO²"
 #define D_CODE "code"                // Button code
 #define D_COLDLIGHT "kalt"
diff --git a/sonoff/language/el-GR.h b/sonoff/language/el-GR.h
index 789d88a6f..3187eadf9 100644
--- a/sonoff/language/el-GR.h
+++ b/sonoff/language/el-GR.h
@@ -60,10 +60,12 @@
 #define D_BLINKOFF "Δεν αναβοσβήνει"
 #define D_BOOT_COUNT "Αριθμός εκκινήσεων"
 #define D_BRIGHTLIGHT "Λαμπερό"
+#define D_BSSID "BSSId"
 #define D_BUTTON "Κουμπί"
 #define D_BY "από"                    // Written by me
 #define D_BYTES "Bytes"
 #define D_CELSIUS "Κελσίου"
+#define D_CHANNEL "Channel"
 #define D_CO2 "Διοξείδιο του άνθρακα"
 #define D_CODE "κώδικας"                // Button code
 #define D_COLDLIGHT "Ψυχρός"
diff --git a/sonoff/language/en-GB.h b/sonoff/language/en-GB.h
index e8af7fab1..558877db2 100644
--- a/sonoff/language/en-GB.h
+++ b/sonoff/language/en-GB.h
@@ -60,10 +60,12 @@
 #define D_BLINKOFF "BlinkOff"
 #define D_BOOT_COUNT "Boot Count"
 #define D_BRIGHTLIGHT "Bright"
+#define D_BSSID "BSSId"
 #define D_BUTTON "Button"
 #define D_BY "by"                    // Written by me
 #define D_BYTES "Bytes"
 #define D_CELSIUS "Celsius"
+#define D_CHANNEL "Channel"
 #define D_CO2 "Carbon dioxide"
 #define D_CODE "code"                // Button code
 #define D_COLDLIGHT "Cold"
diff --git a/sonoff/language/es-AR.h b/sonoff/language/es-AR.h
index 68e9141ea..c1993ffee 100644
--- a/sonoff/language/es-AR.h
+++ b/sonoff/language/es-AR.h
@@ -60,10 +60,12 @@
 #define D_BLINKOFF "BlinkOff"
 #define D_BOOT_COUNT "Conteo Reinicios"
 #define D_BRIGHTLIGHT "Brillante"
+#define D_BSSID "BSSId"
 #define D_BUTTON "Botón"
 #define D_BY "por"                    // Written by me
 #define D_BYTES "Bytes"
 #define D_CELSIUS "Celsius"
+#define D_CHANNEL "Channel"
 #define D_CO2 "CO2"
 #define D_CODE "código"                // Button code
 #define D_COLDLIGHT "Fría"
diff --git a/sonoff/language/fr-FR.h b/sonoff/language/fr-FR.h
index 1e5c2b9f8..2a46f7b53 100644
--- a/sonoff/language/fr-FR.h
+++ b/sonoff/language/fr-FR.h
@@ -60,10 +60,12 @@
 #define D_BLINKOFF "BlinkOff"
 #define D_BOOT_COUNT "Nombre de boot"
 #define D_BRIGHTLIGHT "Luminosité"
+#define D_BSSID "BSSId"
 #define D_BUTTON "Bouton"
 #define D_BY "par"                    // Written by me
 #define D_BYTES "Bytes"
 #define D_CELSIUS "Celsius"
+#define D_CHANNEL "Channel"
 #define D_CO2 "Dioxyde de carbone"
 #define D_CODE "code"                // Button code
 #define D_COLDLIGHT "Froid"
diff --git a/sonoff/language/hu-HU.h b/sonoff/language/hu-HU.h
index 76076427e..c57278176 100644
--- a/sonoff/language/hu-HU.h
+++ b/sonoff/language/hu-HU.h
@@ -60,10 +60,12 @@
 #define D_BLINKOFF "Villogás Ki"
 #define D_BOOT_COUNT "Bootolások száma"
 #define D_BRIGHTLIGHT "Max. fényerő"
+#define D_BSSID "BSSId"
 #define D_BUTTON "Gomb"
 #define D_BY "tőle:"                    // Written by me
 #define D_BYTES "Byte-ok"
 #define D_CELSIUS "Celsius"
+#define D_CHANNEL "Channel"
 #define D_CO2 "Szén-dioxid"
 #define D_CODE "kód"                // Button code
 #define D_COLDLIGHT "Hideg"
diff --git a/sonoff/language/it-IT.h b/sonoff/language/it-IT.h
index 2beda2e79..d07a33021 100644
--- a/sonoff/language/it-IT.h
+++ b/sonoff/language/it-IT.h
@@ -60,10 +60,12 @@
 #define D_BLINKOFF "BlinkOff"
 #define D_BOOT_COUNT "Numero di boot"
 #define D_BRIGHTLIGHT "Luminoso"
+#define D_BSSID "BSSId"
 #define D_BUTTON "Pulsante"
 #define D_BY "da"                    // Written by me
 #define D_BYTES "Bytes"
 #define D_CELSIUS "Celsius"
+#define D_CHANNEL "Channel"
 #define D_CO2 "CO2"
 #define D_CODE "codice"                // Button code
 #define D_COLDLIGHT "Fredda"
diff --git a/sonoff/language/nl-NL.h b/sonoff/language/nl-NL.h
index 8ef596448..05ec4666b 100644
--- a/sonoff/language/nl-NL.h
+++ b/sonoff/language/nl-NL.h
@@ -60,10 +60,12 @@
 #define D_BLINKOFF "KnipperUit"
 #define D_BOOT_COUNT "Herstarts"
 #define D_BRIGHTLIGHT "Fel"
+#define D_BSSID "BSSId"
 #define D_BUTTON "DrukKnop"
 #define D_BY "door"                  // Written by me
 #define D_BYTES "Bytes"
 #define D_CELSIUS "Celsius"
+#define D_CHANNEL "Kanaal"
 #define D_CO2 "Koolstofdioxide"
 #define D_CODE "code"                // Button code
 #define D_COLDLIGHT "Koud"
diff --git a/sonoff/language/pl-PL.h b/sonoff/language/pl-PL.h
index 06d086c57..faaf8df6d 100644
--- a/sonoff/language/pl-PL.h
+++ b/sonoff/language/pl-PL.h
@@ -60,10 +60,12 @@
 #define D_BLINKOFF "MiganieWył"
 #define D_BOOT_COUNT "Licznik uruchomienia"
 #define D_BRIGHTLIGHT "Jasny"
+#define D_BSSID "BSSId"
 #define D_BUTTON "Przycisk"
 #define D_BY "by"                    // Written by me
 #define D_BYTES "Bajtow"
 #define D_CELSIUS "Celsiusza"
+#define D_CHANNEL "Channel"
 #define D_CO2 "Dwutlenku węgla"
 #define D_CODE "kod"                 // Button code
 #define D_COLDLIGHT "Zimny"
diff --git a/sonoff/language/pt-BR.h b/sonoff/language/pt-BR.h
index 6c5f3fceb..318f69e45 100644
--- a/sonoff/language/pt-BR.h
+++ b/sonoff/language/pt-BR.h
@@ -60,10 +60,12 @@
 #define D_BLINKOFF "Pulsar desligado"
 #define D_BOOT_COUNT "Contagem de inicialização"
 #define D_BRIGHTLIGHT "Brilho"
+#define D_BSSID "BSSId"
 #define D_BUTTON "Botão"
 #define D_BY "por"                    // Write by me
 #define D_BYTES "Bytes"
 #define D_CELSIUS "Celsius"
+#define D_CHANNEL "Channel"
 #define D_CO2 "Dióxido de carbono"
 #define D_CODE "Código"                // Button code
 #define D_COLDLIGHT "Luz fria"
diff --git a/sonoff/language/pt-PT.h b/sonoff/language/pt-PT.h
index 0c93620e8..d39ec6e50 100644
--- a/sonoff/language/pt-PT.h
+++ b/sonoff/language/pt-PT.h
@@ -60,10 +60,12 @@
 #define D_BLINKOFF "Piscar desligado"
 #define D_BOOT_COUNT "Contagem de Inicialização"
 #define D_BRIGHTLIGHT "Brilho"
+#define D_BSSID "BSSId"
 #define D_BUTTON "Botão"
 #define D_BY "por"                    // Write by me
 #define D_BYTES "Bytes"
 #define D_CELSIUS "Celsius"
+#define D_CHANNEL "Channel"
 #define D_CO2 "Dioxido de Carbono"
 #define D_CODE "Código"                // Button code
 #define D_COLDLIGHT "Luz Fria"
diff --git a/sonoff/language/ru-RU.h b/sonoff/language/ru-RU.h
index 2fa9d388f..5fea0468e 100644
--- a/sonoff/language/ru-RU.h
+++ b/sonoff/language/ru-RU.h
@@ -60,10 +60,12 @@
 #define D_BLINKOFF "Не Мигать"
 #define D_BOOT_COUNT "Количество загрузок"
 #define D_BRIGHTLIGHT "Яркость"
+#define D_BSSID "BSSId"
 #define D_BUTTON "Кнопка"
 #define D_BY "by"                    // Written by me
 #define D_BYTES "Байт"
 #define D_CELSIUS "Цельсия"
+#define D_CHANNEL "Channel"
 #define D_CO2 "Углекислый газ"
 #define D_CODE "код"                // Button code
 #define D_COLDLIGHT "Холодный"
diff --git a/sonoff/language/tr-TR.h b/sonoff/language/tr-TR.h
index 3d88ae1a8..b133d2c80 100755
--- a/sonoff/language/tr-TR.h
+++ b/sonoff/language/tr-TR.h
@@ -60,10 +60,12 @@
 #define D_BLINKOFF "BlinkOff"
 #define D_BOOT_COUNT "Yeniden başlama sayısı"
 #define D_BRIGHTLIGHT "Işık"
+#define D_BSSID "BSSId"
 #define D_BUTTON "Buton"
 #define D_BY "by"                    // Written by me
 #define D_BYTES "Bayt"
 #define D_CELSIUS "Derece"
+#define D_CHANNEL "Channel"
 #define D_CO2 "Karbon dioksit"
 #define D_CODE "kod"                // Button code
 #define D_COLDLIGHT "Soğuk"
@@ -536,4 +538,4 @@
 #define D_LOG_UPNP "UPP: "         // UPnP
 #define D_LOG_WIFI "WIF: "         // Wifi
 
-#endif  // _LANGUAGE_TR_TR_H_
\ No newline at end of file
+#endif  // _LANGUAGE_TR_TR_H_
diff --git a/sonoff/language/uk-UK.h b/sonoff/language/uk-UK.h
index a2fe05843..9cf66773b 100644
--- a/sonoff/language/uk-UK.h
+++ b/sonoff/language/uk-UK.h
@@ -60,10 +60,12 @@
 #define D_BLINKOFF "Не блимати"
 #define D_BOOT_COUNT "Кіл-сть завант."
 #define D_BRIGHTLIGHT "Яскравість"
+#define D_BSSID "BSSId"
 #define D_BUTTON "Кнопка"
 #define D_BY "by"                    // Written by me
 #define D_BYTES "Байт"
 #define D_CELSIUS "Цельсія"
+#define D_CHANNEL "Channel"
 #define D_CO2 "Вуглек. газ"
 #define D_CODE "код"                // Button code
 #define D_COLDLIGHT "Холодний"
diff --git a/sonoff/language/zh-CN.h b/sonoff/language/zh-CN.h
index 70186035d..88f680f8e 100644
--- a/sonoff/language/zh-CN.h
+++ b/sonoff/language/zh-CN.h
@@ -60,10 +60,12 @@
 #define D_BLINKOFF "闪烁关"
 #define D_BOOT_COUNT "启动次数"
 #define D_BRIGHTLIGHT "亮"
+#define D_BSSID "BSSId"
 #define D_BUTTON "按钮"
 #define D_BY "汉化: killadm 作者:"                    // Written by me
 #define D_BYTES "大小:"
 #define D_CELSIUS "摄氏"
+#define D_CHANNEL "Channel"
 #define D_CO2 "二氧化碳"
 #define D_CODE "代码"                // Button code
 #define D_COLDLIGHT "冷"
diff --git a/sonoff/language/zh-TW.h b/sonoff/language/zh-TW.h
index 16e6961d0..abb92d359 100644
--- a/sonoff/language/zh-TW.h
+++ b/sonoff/language/zh-TW.h
@@ -60,10 +60,12 @@
 #define D_BLINKOFF "閃爍關"
 #define D_BOOT_COUNT "啟動次數"
 #define D_BRIGHTLIGHT "亮度"
+#define D_BSSID "BSSId"
 #define D_BUTTON "按鈕"
 #define D_BY "by"                    // Written by me
 #define D_BYTES "大小:"
 #define D_CELSIUS "攝氏"
+#define D_CHANNEL "Channel"
 #define D_CO2 "二氧化碳"
 #define D_CODE "代碼"                // Button code
 #define D_COLDLIGHT "冷"
diff --git a/sonoff/xdrv_02_webserver.ino b/sonoff/xdrv_02_webserver.ino
index 91c01eeae..951c25f9d 100644
--- a/sonoff/xdrv_02_webserver.ino
+++ b/sonoff/xdrv_02_webserver.ino
@@ -254,7 +254,7 @@ const char HTTP_FORM_MODULE[] PROGMEM =
   "<input id='w' name='w' value='6,1' hidden>"
   "<br/><b>" D_MODULE_TYPE "</b> ({mt)<br/><select id='g99' name='g99'></select><br/>";
 const char HTTP_LNK_ITEM[] PROGMEM =
-  "<div><a href='#p' onclick='c(this)'>{v}</a>&nbsp;<span class='q'>{i} {r}%</span></div>";
+  "<div><a href='#p' onclick='c(this)'>{v}</a>&nbsp;({w})&nbsp<span class='q'>{i} {r}%</span></div>";
 const char HTTP_LNK_SCAN[] PROGMEM =
   "<div><a href='/w1'>" D_SCAN_FOR_WIFI_NETWORKS "</a></div><br/>";
 const char HTTP_FORM_WIFI[] PROGMEM =
@@ -882,7 +882,7 @@ void HandleWifi(boolean scan)
       //display networks in page
       for (int i = 0; i < n; i++) {
         if (-1 == indices[i]) { continue; }  // skip dups
-        snprintf_P(log_data, sizeof(log_data), PSTR(D_LOG_WIFI D_SSID " %s, " D_RSSI " %d"), WiFi.SSID(indices[i]).c_str(), WiFi.RSSI(indices[i]));
+        snprintf_P(log_data, sizeof(log_data), PSTR(D_LOG_WIFI D_SSID " %s, " D_BSSID " %s, " D_CHANNEL " %d, " D_RSSI " %d"), WiFi.SSID(indices[i]).c_str(), WiFi.BSSIDstr(indices[i]).c_str(), WiFi.channel(indices[i]), WiFi.RSSI(indices[i]));
         AddLog(LOG_LEVEL_DEBUG);
         int quality = WifiGetRssiAsQuality(WiFi.RSSI(indices[i]));
 
@@ -891,6 +891,7 @@ void HandleWifi(boolean scan)
           String rssiQ;
           rssiQ += quality;
           item.replace(F("{v}"), WiFi.SSID(indices[i]));
+          item.replace(F("{w}"), String(WiFi.channel(indices[i])));
           item.replace(F("{r}"), rssiQ);
           uint8_t auth = WiFi.encryptionType(indices[i]);
           item.replace(F("{i}"), (ENC_TYPE_WEP == auth) ? F(D_WEP) : (ENC_TYPE_TKIP == auth) ? F(D_WPA_PSK) : (ENC_TYPE_CCMP == auth) ? F(D_WPA2_PSK) : (ENC_TYPE_AUTO == auth) ? F(D_AUTO) : F(""));