From 39e0cf574d02e19cb7adfe7a68d53f93715ef4bf Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Mon, 9 Oct 2023 11:33:24 +0200
Subject: [PATCH] Refactor AP1 information

---
 tasmota/language/af_AF.h                            | 1 +
 tasmota/language/bg_BG.h                            | 1 +
 tasmota/language/ca_AD.h                            | 1 +
 tasmota/language/cs_CZ.h                            | 1 +
 tasmota/language/de_DE.h                            | 1 +
 tasmota/language/el_GR.h                            | 1 +
 tasmota/language/en_GB.h                            | 1 +
 tasmota/language/es_ES.h                            | 1 +
 tasmota/language/fr_FR.h                            | 1 +
 tasmota/language/fy_NL.h                            | 1 +
 tasmota/language/he_HE.h                            | 1 +
 tasmota/language/hu_HU.h                            | 1 +
 tasmota/language/it_IT.h                            | 1 +
 tasmota/language/ko_KO.h                            | 1 +
 tasmota/language/nl_NL.h                            | 1 +
 tasmota/language/pl_PL.h                            | 1 +
 tasmota/language/pt_BR.h                            | 1 +
 tasmota/language/pt_PT.h                            | 1 +
 tasmota/language/ro_RO.h                            | 1 +
 tasmota/language/ru_RU.h                            | 1 +
 tasmota/language/sk_SK.h                            | 1 +
 tasmota/language/sv_SE.h                            | 1 +
 tasmota/language/tr_TR.h                            | 1 +
 tasmota/language/uk_UA.h                            | 1 +
 tasmota/language/vi_VN.h                            | 1 +
 tasmota/language/zh_CN.h                            | 1 +
 tasmota/language/zh_TW.h                            | 1 +
 tasmota/tasmota_xdrv_driver/xdrv_01_9_webserver.ino | 8 +++++++-
 28 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/tasmota/language/af_AF.h b/tasmota/language/af_AF.h
index 84c94b67b834..213a0d52068e 100644
--- a/tasmota/language/af_AF.h
+++ b/tasmota/language/af_AF.h
@@ -306,6 +306,7 @@
 #define D_REFRESH_TO_SCAN_AGAIN "Verfris om weer te skandeer"
 #define D_DUPLICATE_ACCESSPOINT "Duplikaat AccessPoint"
 #define D_SKIPPING_LOW_QUALITY "Slaan oor as gevolg van lae gehalte"
+#define D_MODE "Mode"
 #define D_RSSI "RSSI"
 #define D_WEP "WEP"
 #define D_WPA_PSK "WPA PSK"
diff --git a/tasmota/language/bg_BG.h b/tasmota/language/bg_BG.h
index d39ca9b50432..1a761de28662 100644
--- a/tasmota/language/bg_BG.h
+++ b/tasmota/language/bg_BG.h
@@ -306,6 +306,7 @@
 #define D_REFRESH_TO_SCAN_AGAIN "Обновяване за повторно сканиране"
 #define D_DUPLICATE_ACCESSPOINT "Дублирана точка за достъп"
 #define D_SKIPPING_LOW_QUALITY "Пропускане поради лошо качество"
+#define D_MODE "Mode"
 #define D_RSSI "RSSI"
 #define D_WEP "WEP"
 #define D_WPA_PSK "WPA PSK"
diff --git a/tasmota/language/ca_AD.h b/tasmota/language/ca_AD.h
index 7c134ab31d2d..1b4b62aff794 100644
--- a/tasmota/language/ca_AD.h
+++ b/tasmota/language/ca_AD.h
@@ -306,6 +306,7 @@
 #define D_REFRESH_TO_SCAN_AGAIN "Refresca per tornar a cercar"
 #define D_DUPLICATE_ACCESSPOINT "Punt d'accès Duplicat"
 #define D_SKIPPING_LOW_QUALITY "Massa baixa qualitat"
+#define D_MODE "Mode"
 #define D_RSSI "RSSI"
 #define D_WEP "WEP"
 #define D_WPA_PSK "WPA PSK"
diff --git a/tasmota/language/cs_CZ.h b/tasmota/language/cs_CZ.h
index e9115ac239fe..67d93ce26051 100644
--- a/tasmota/language/cs_CZ.h
+++ b/tasmota/language/cs_CZ.h
@@ -306,6 +306,7 @@
 #define D_REFRESH_TO_SCAN_AGAIN "Zopakovat scan"
 #define D_DUPLICATE_ACCESSPOINT "Kopie AP"
 #define D_SKIPPING_LOW_QUALITY "Přeskočení z důvodu kvality signálu"
+#define D_MODE "Mode"
 #define D_RSSI "RSSI"
 #define D_WEP "WEP"
 #define D_WPA_PSK "WPA PSK"
diff --git a/tasmota/language/de_DE.h b/tasmota/language/de_DE.h
index 5a7b79ab0579..f01302bd304e 100644
--- a/tasmota/language/de_DE.h
+++ b/tasmota/language/de_DE.h
@@ -306,6 +306,7 @@
 #define D_REFRESH_TO_SCAN_AGAIN "Aktualisieren, um erneut zu suchen"
 #define D_DUPLICATE_ACCESSPOINT "AccessPoint duplizieren"
 #define D_SKIPPING_LOW_QUALITY "überspringe wegen niedriger Qualität"
+#define D_MODE "Mode"
 #define D_RSSI "RSSI"
 #define D_WEP "WEP"
 #define D_WPA_PSK "WPA-PSK"
diff --git a/tasmota/language/el_GR.h b/tasmota/language/el_GR.h
index b8d96c3ba753..348be66e8f75 100644
--- a/tasmota/language/el_GR.h
+++ b/tasmota/language/el_GR.h
@@ -306,6 +306,7 @@
 #define D_REFRESH_TO_SCAN_AGAIN "Πατήστε ανανέωση για μια νέα σάρωση"
 #define D_DUPLICATE_ACCESSPOINT "Διπλότυπο AccessPoint"
 #define D_SKIPPING_LOW_QUALITY "Παράκαμψη λόγω χαμηλής ποιότητας"
+#define D_MODE "Mode"
 #define D_RSSI "RSSI"
 #define D_WEP "WEP"
 #define D_WPA_PSK "WPA PSK"
diff --git a/tasmota/language/en_GB.h b/tasmota/language/en_GB.h
index 46169be2f338..e9ebfa690222 100644
--- a/tasmota/language/en_GB.h
+++ b/tasmota/language/en_GB.h
@@ -306,6 +306,7 @@
 #define D_REFRESH_TO_SCAN_AGAIN "Refresh to scan again"
 #define D_DUPLICATE_ACCESSPOINT "Duplicate AccessPoint"
 #define D_SKIPPING_LOW_QUALITY "Skipping due to low quality"
+#define D_MODE "Mode"
 #define D_RSSI "RSSI"
 #define D_WEP "WEP"
 #define D_WPA_PSK "WPA PSK"
diff --git a/tasmota/language/es_ES.h b/tasmota/language/es_ES.h
index 1d2ae8913e89..38be6db006b7 100644
--- a/tasmota/language/es_ES.h
+++ b/tasmota/language/es_ES.h
@@ -306,6 +306,7 @@
 #define D_REFRESH_TO_SCAN_AGAIN "Recargar página para buscar nuevamente"
 #define D_DUPLICATE_ACCESSPOINT "AccessPoint duplicado"
 #define D_SKIPPING_LOW_QUALITY "Ignorado por baja calidad"
+#define D_MODE "Mode"
 #define D_RSSI "RSSI"
 #define D_WEP "WEP"
 #define D_WPA_PSK "WPA PSK"
diff --git a/tasmota/language/fr_FR.h b/tasmota/language/fr_FR.h
index 79201509fa15..69faa8548695 100644
--- a/tasmota/language/fr_FR.h
+++ b/tasmota/language/fr_FR.h
@@ -306,6 +306,7 @@
 #define D_REFRESH_TO_SCAN_AGAIN "Rafraîchir pour scanner à nouveau"
 #define D_DUPLICATE_ACCESSPOINT "Point d'Accès dupliqué"
 #define D_SKIPPING_LOW_QUALITY "Évité car de mauvaise qualité"
+#define D_MODE "Mode"
 #define D_RSSI "RSSI"
 #define D_WEP "WEP"
 #define D_WPA_PSK "WPA PSK"
diff --git a/tasmota/language/fy_NL.h b/tasmota/language/fy_NL.h
index d1cb3d46a9aa..b4d28617fcb3 100644
--- a/tasmota/language/fy_NL.h
+++ b/tasmota/language/fy_NL.h
@@ -306,6 +306,7 @@
 #define D_REFRESH_TO_SCAN_AGAIN "Ferfarskje om opnij te sykjen"
 #define D_DUPLICATE_ACCESSPOINT "Dûbele tagongspunt"
 #define D_SKIPPING_LOW_QUALITY "Oerslaan fanwegen lege opfangkwaliteit"
+#define D_MODE "Mode"
 #define D_RSSI "RSSI"
 #define D_WEP "WEP"
 #define D_WPA_PSK "WPA PSK"
diff --git a/tasmota/language/he_HE.h b/tasmota/language/he_HE.h
index 6d7c67695078..cc08a426f952 100644
--- a/tasmota/language/he_HE.h
+++ b/tasmota/language/he_HE.h
@@ -306,6 +306,7 @@
 #define D_REFRESH_TO_SCAN_AGAIN "רענן כדי לסרוק שוב"
 #define D_DUPLICATE_ACCESSPOINT "נקודות גישה משוכפלות"
 #define D_SKIPPING_LOW_QUALITY "מדלג עקב איכות רשת נמוכה"
+#define D_MODE "Mode"
 #define D_RSSI "RSSI"
 #define D_WEP "WEP"
 #define D_WPA_PSK "WPA PSK"
diff --git a/tasmota/language/hu_HU.h b/tasmota/language/hu_HU.h
index c99e4398ece0..58de5690d77d 100644
--- a/tasmota/language/hu_HU.h
+++ b/tasmota/language/hu_HU.h
@@ -306,6 +306,7 @@
 #define D_REFRESH_TO_SCAN_AGAIN "Frissíts az újrakereséshez"
 #define D_DUPLICATE_ACCESSPOINT "Duplikált access point"
 #define D_SKIPPING_LOW_QUALITY "Rossz, alacsony jelminőség"
+#define D_MODE "Mode"
 #define D_RSSI "RSSI"
 #define D_WEP "WEP"
 #define D_WPA_PSK "WPA PSK"
diff --git a/tasmota/language/it_IT.h b/tasmota/language/it_IT.h
index 2dbcae6de962..a15647f3dece 100644
--- a/tasmota/language/it_IT.h
+++ b/tasmota/language/it_IT.h
@@ -306,6 +306,7 @@
 #define D_REFRESH_TO_SCAN_AGAIN          "Aggiorna per nuova scansione"
 #define D_DUPLICATE_ACCESSPOINT          "Access Point duplicato"
 #define D_SKIPPING_LOW_QUALITY           "Ignorato a causa di bassa qualità"
+#define D_MODE                           "Mode"
 #define D_RSSI                           "RSSI"
 #define D_WEP                            "WEP"
 #define D_WPA_PSK                        "WPA PSK"
diff --git a/tasmota/language/ko_KO.h b/tasmota/language/ko_KO.h
index d27a8aad8a07..ff3a62de7685 100644
--- a/tasmota/language/ko_KO.h
+++ b/tasmota/language/ko_KO.h
@@ -306,6 +306,7 @@
 #define D_REFRESH_TO_SCAN_AGAIN "검색 재시도"
 #define D_DUPLICATE_ACCESSPOINT "중복된 AccessPoint"
 #define D_SKIPPING_LOW_QUALITY "약한 네트워크 신호 무시"
+#define D_MODE "Mode"
 #define D_RSSI "RSSI"
 #define D_WEP "WEP"
 #define D_WPA_PSK "WPA PSK"
diff --git a/tasmota/language/nl_NL.h b/tasmota/language/nl_NL.h
index c6325ed83ea7..d0b92c2011ae 100644
--- a/tasmota/language/nl_NL.h
+++ b/tasmota/language/nl_NL.h
@@ -306,6 +306,7 @@
 #define D_REFRESH_TO_SCAN_AGAIN "Vernieuw om opnieuw te zoeken"
 #define D_DUPLICATE_ACCESSPOINT "Dubbel AccessPoint"
 #define D_SKIPPING_LOW_QUALITY "Overslaan agv lage ontvangskwaliteit"
+#define D_MODE "Mode"
 #define D_RSSI "RSSI"
 #define D_WEP "WEP"
 #define D_WPA_PSK "WPA PSK"
diff --git a/tasmota/language/pl_PL.h b/tasmota/language/pl_PL.h
index 255f75f78cb0..c0cd0e8e8fd0 100644
--- a/tasmota/language/pl_PL.h
+++ b/tasmota/language/pl_PL.h
@@ -306,6 +306,7 @@
 #define D_REFRESH_TO_SCAN_AGAIN "Odśwież aby ponownie wyszukać sieci"
 #define D_DUPLICATE_ACCESSPOINT "Duplikuj"
 #define D_SKIPPING_LOW_QUALITY "Pominięto z powodu niskiej jakości sygnału"
+#define D_MODE "Mode"
 #define D_RSSI "RSSI"
 #define D_WEP "WEP"
 #define D_WPA_PSK "WPA PSK"
diff --git a/tasmota/language/pt_BR.h b/tasmota/language/pt_BR.h
index d803143558c5..4893a5a55674 100644
--- a/tasmota/language/pt_BR.h
+++ b/tasmota/language/pt_BR.h
@@ -306,6 +306,7 @@
 #define D_REFRESH_TO_SCAN_AGAIN "Nova busca"
 #define D_DUPLICATE_ACCESSPOINT "Ponto de Acesso duplicado"
 #define D_SKIPPING_LOW_QUALITY "Ignorado devido à baixa qualidade do sinal"
+#define D_MODE "Mode"
 #define D_RSSI "RSSI"
 #define D_WEP "WEP"
 #define D_WPA_PSK "WPA PSK"
diff --git a/tasmota/language/pt_PT.h b/tasmota/language/pt_PT.h
index 1511eb78e648..a8eb67bff33a 100644
--- a/tasmota/language/pt_PT.h
+++ b/tasmota/language/pt_PT.h
@@ -306,6 +306,7 @@
 #define D_REFRESH_TO_SCAN_AGAIN "Atualize para realizar nova pesquisa"
 #define D_DUPLICATE_ACCESSPOINT "Duplicar ponto de Acesso"
 #define D_SKIPPING_LOW_QUALITY "Ignorado devido a baixa qualidade do sinal"
+#define D_MODE "Mode"
 #define D_RSSI "RSSI"
 #define D_WEP "WEP"
 #define D_WPA_PSK "WPA PSK"
diff --git a/tasmota/language/ro_RO.h b/tasmota/language/ro_RO.h
index a03db3241729..29258cb6e94e 100644
--- a/tasmota/language/ro_RO.h
+++ b/tasmota/language/ro_RO.h
@@ -306,6 +306,7 @@
 #define D_REFRESH_TO_SCAN_AGAIN "Refresh pentru o nouă scanare"
 #define D_DUPLICATE_ACCESSPOINT "Clonează AccessPoint"
 #define D_SKIPPING_LOW_QUALITY "Omite,joasă calitate"
+#define D_MODE "Mode"
 #define D_RSSI "RSSI"
 #define D_WEP "WEP"
 #define D_WPA_PSK "WPA PSK"
diff --git a/tasmota/language/ru_RU.h b/tasmota/language/ru_RU.h
index 437805f0dd1e..f0d0e23e5d5f 100644
--- a/tasmota/language/ru_RU.h
+++ b/tasmota/language/ru_RU.h
@@ -307,6 +307,7 @@
 #define D_REFRESH_TO_SCAN_AGAIN "Обновить для повторного сканирования"
 #define D_DUPLICATE_ACCESSPOINT "Дублировать Точку Доступа (AP)"
 #define D_SKIPPING_LOW_QUALITY "Пропущено из-за низкого качества"
+#define D_MODE "Mode"
 #define D_RSSI "RSSI"
 #define D_WEP "WEP"
 #define D_WPA_PSK "WPA PSK"
diff --git a/tasmota/language/sk_SK.h b/tasmota/language/sk_SK.h
index 2ea6ab24a30d..b11a041ba57b 100644
--- a/tasmota/language/sk_SK.h
+++ b/tasmota/language/sk_SK.h
@@ -306,6 +306,7 @@
 #define D_REFRESH_TO_SCAN_AGAIN "Zopakovať sken"
 #define D_DUPLICATE_ACCESSPOINT "Kópia AP"
 #define D_SKIPPING_LOW_QUALITY "Preskočenie z dôvodu kvality signálu"
+#define D_MODE "Mode"
 #define D_RSSI "RSSI"
 #define D_WEP "WEP"
 #define D_WPA_PSK "WPA PSK"
diff --git a/tasmota/language/sv_SE.h b/tasmota/language/sv_SE.h
index 79f1563312a1..9986715ef324 100644
--- a/tasmota/language/sv_SE.h
+++ b/tasmota/language/sv_SE.h
@@ -306,6 +306,7 @@
 #define D_REFRESH_TO_SCAN_AGAIN "Uppdatera för att skanna igen"
 #define D_DUPLICATE_ACCESSPOINT "Dubblett accesspunkt"
 #define D_SKIPPING_LOW_QUALITY "Hoppa över pga dålig kvalitet"
+#define D_MODE "Mode"
 #define D_RSSI "RSSI"
 #define D_WEP "WEP"
 #define D_WPA_PSK "WPA PSK"
diff --git a/tasmota/language/tr_TR.h b/tasmota/language/tr_TR.h
index e03b0fa771d8..90e80936bf8c 100644
--- a/tasmota/language/tr_TR.h
+++ b/tasmota/language/tr_TR.h
@@ -306,6 +306,7 @@
 #define D_REFRESH_TO_SCAN_AGAIN "Tekrar tarama - yenile"
 #define D_DUPLICATE_ACCESSPOINT "AP'yi çoğalt"
 #define D_SKIPPING_LOW_QUALITY "Düşük kalitedekileri dikkate alma"
+#define D_MODE "Mode"
 #define D_RSSI "RSSI"
 #define D_WEP "WEP"
 #define D_WPA_PSK "WPA PSK"
diff --git a/tasmota/language/uk_UA.h b/tasmota/language/uk_UA.h
index 7a4f6d05bcdd..ebccd0423a74 100644
--- a/tasmota/language/uk_UA.h
+++ b/tasmota/language/uk_UA.h
@@ -306,6 +306,7 @@
 #define D_REFRESH_TO_SCAN_AGAIN "Оновити для повторного сканування"
 #define D_DUPLICATE_ACCESSPOINT "Дублювати Точку Доступу (AP)"
 #define D_SKIPPING_LOW_QUALITY "Пропущено через низьку якість"
+#define D_MODE "Mode"
 #define D_RSSI "RSSI"
 #define D_WEP "WEP"
 #define D_WPA_PSK "WPA PSK"
diff --git a/tasmota/language/vi_VN.h b/tasmota/language/vi_VN.h
index f9395cf97104..6beaa9330f4f 100644
--- a/tasmota/language/vi_VN.h
+++ b/tasmota/language/vi_VN.h
@@ -306,6 +306,7 @@
 #define D_REFRESH_TO_SCAN_AGAIN "Quét lại"
 #define D_DUPLICATE_ACCESSPOINT "Điểm truy cập trùng lặp"
 #define D_SKIPPING_LOW_QUALITY "Bỏ qua do tín hiệu kém"
+#define D_MODE "Mode"
 #define D_RSSI "RSSI"
 #define D_WEP "WEP"
 #define D_WPA_PSK "WPA PSK"
diff --git a/tasmota/language/zh_CN.h b/tasmota/language/zh_CN.h
index 46820d341889..552b9054e3b6 100644
--- a/tasmota/language/zh_CN.h
+++ b/tasmota/language/zh_CN.h
@@ -306,6 +306,7 @@
 #define D_REFRESH_TO_SCAN_AGAIN "刷新并重试"
 #define D_DUPLICATE_ACCESSPOINT "重复AP"
 #define D_SKIPPING_LOW_QUALITY "忽略弱信号网络"
+#define D_MODE "Mode"
 #define D_RSSI "RSSI"
 #define D_WEP "WEP"
 #define D_WPA_PSK "WPA PSK"
diff --git a/tasmota/language/zh_TW.h b/tasmota/language/zh_TW.h
index d077466bc8d1..9028ce8b74f9 100644
--- a/tasmota/language/zh_TW.h
+++ b/tasmota/language/zh_TW.h
@@ -306,6 +306,7 @@
 #define D_REFRESH_TO_SCAN_AGAIN "重新整理以重新掃描"
 #define D_DUPLICATE_ACCESSPOINT "重覆的存取點"
 #define D_SKIPPING_LOW_QUALITY "正在忽略訊號品質不佳的訊號"
+#define D_MODE "Mode"
 #define D_RSSI "RSSI"
 #define D_WEP "WEP"
 #define D_WPA_PSK "WPA PSK"
diff --git a/tasmota/tasmota_xdrv_driver/xdrv_01_9_webserver.ino b/tasmota/tasmota_xdrv_driver/xdrv_01_9_webserver.ino
index 0a1fb9a3fc2e..6795a1c4b843 100644
--- a/tasmota/tasmota_xdrv_driver/xdrv_01_9_webserver.ino
+++ b/tasmota/tasmota_xdrv_driver/xdrv_01_9_webserver.ino
@@ -2379,7 +2379,13 @@ void HandleInformation(void)
   }
   if (Settings->flag4.network_wifi) {
     int32_t rssi = WiFi.RSSI();
-    WSContentSend_P(PSTR("}1" D_AP "%d " D_INFORMATION "}2" D_SSID ": %s<BR>" D_RSSI ": %d%%, %d dBm<BR>Mode: 11%c<BR>" D_CHANNEL ": %d<BR>" D_BSSID ": %s"), Settings->sta_active +1, HtmlEscape(SettingsText(SET_STASSID1 + Settings->sta_active)).c_str(), WifiGetRssiAsQuality(rssi), rssi, pgm_read_byte(&kWifiPhyMode[WiFi.getPhyMode() & 0x3]), WiFi.channel(), WiFi.BSSIDstr().c_str());
+    WSContentSend_P(PSTR("}1" D_AP "%d " D_INFORMATION "}2" D_SSID " %s<br>" D_RSSI " %d%%, %d dBm<br>" D_MODE " 11%c<br>" D_CHANNEL " %d<br>" D_BSSID " %s"), 
+      Settings->sta_active +1,
+      HtmlEscape(SettingsText(SET_STASSID1 + Settings->sta_active)).c_str(),
+      WifiGetRssiAsQuality(rssi), rssi,
+      pgm_read_byte(&kWifiPhyMode[WiFi.getPhyMode() & 0x3]),
+      WiFi.channel(),
+      WiFi.BSSIDstr().c_str());
     WSContentSend_P(PSTR("}1}2&nbsp;"));  // Empty line
     WSContentSend_P(PSTR("}1" D_HOSTNAME "}2%s%s"), TasmotaGlobal.hostname, (Mdns.begun) ? PSTR(".local") : "");
 #ifdef USE_IPV6