Refactor AP1 information

stefanbode · Oct 9, 2023 · 39e0cf5 · 39e0cf5
1 parent a1cce95
commit 39e0cf5
Show file tree

Hide file tree

Showing 28 changed files with 34 additions and 1 deletion.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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