" D_CONFIGURATION_SAVED ""));
- if (2 == type) {
- WSContentSend_P(PSTR("
" D_TRYING_TO_CONNECT "
"));
+ if (!(3 == type)) {
+ WSContentSend_P(PSTR("
%s
"), (type==2) ? PSTR(D_TRYING_TO_CONNECT) : PSTR(D_CONFIGURATION_SAVED) );
+ } else {
+#if (AFTER_INITIAL_WIFI_CONFIG_GO_TO_NEW_IP)
+ WSContentSend_P(PSTR("
" D_SUCCESSFUL_WIFI_CONNECTION "
" D_REDIRECTING_TO_NEW_IP "
"), WebColor(COL_TEXT_SUCCESS) );
+#else
+ WSContentSend_P(PSTR("
" D_SUCCESSFUL_WIFI_CONNECTION "
" D_NOW_YOU_CAN_CLOSE_THIS_WINDOW "
"), WebColor(COL_TEXT_SUCCESS) );
+#endif
}
- WSContentSend_P(PSTR("
"));
}
- WSContentSend_P(HTTP_MSG_RSTRT);
- if (HTTP_MANAGER == Web.state || reset_only) {
- Web.state = HTTP_ADMIN;
- } else {
- WSContentSpaceButton(BUTTON_MAIN);
+ if (type<2) {
+ WSContentSend_P(HTTP_MSG_RSTRT);
+ if (HTTP_MANAGER == Web.state || reset_only) {
+ Web.state = HTTP_ADMIN;
+ } else {
+ WSContentSpaceButton(BUTTON_MAIN);
+ }
}
WSContentStop();
- ShowWebSource(SRC_WEBGUI);
- TasmotaGlobal.restart_flag = 2;
+ if (!(2 == type)) {
+ AddLog(LOG_LEVEL_DEBUG, PSTR(D_LOG_HTTP D_RESTART));
+ ShowWebSource(SRC_WEBGUI);
+ TasmotaGlobal.restart_flag = 2;
+ }
}
/*********************************************************************************************/
@@ -919,6 +988,10 @@ void HandleRoot(void)
HandleWifiLogin();
} else {
if (!strlen(SettingsText(SET_WEBPWD)) || (((Webserver->arg(F("USER1")) == WEB_USERNAME ) && (Webserver->arg(F("PASS1")) == SettingsText(SET_WEBPWD) )) || HTTP_MANAGER_RESET_ONLY == Web.state)) {
+ if (!Web.initial_config) {
+ Web.initial_config = !strlen(SettingsText(SET_STASSID1));
+ if (Web.initial_config) { AddLog(LOG_LEVEL_DEBUG, PSTR(D_LOG_HTTP "Blank Device - Initial Configuration")); }
+ }
HandleWifiConfiguration();
} else {
// wrong user and pass
@@ -1648,26 +1721,77 @@ String HtmlEscape(const String unescaped) {
const char kEncryptionType[] PROGMEM = "|||" D_WPA_PSK "||" D_WPA2_PSK "|" D_WEP "||" D_NONE "|" D_AUTO;
void HandleWifiConfiguration(void) {
+ char tmp[TOPSZ]; // Max length is currently 150
+
if (!HttpCheckPriviledgedAccess(!WifiIsInManagerMode())) { return; }
AddLog(LOG_LEVEL_DEBUG, PSTR(D_LOG_HTTP D_CONFIGURE_WIFI));
if (Webserver->hasArg(F("save")) && HTTP_MANAGER_RESET_ONLY != Web.state) {
- WifiSaveSettings();
- WebRestart(2);
+ if ( WifiIsInManagerMode() ) {
+ // Test WIFI Connection to Router
+ // As Tasmota is in this case in AP mode, a STA connection can be established too at the same time
+ Web.wifi_test_counter = 9; // seconds to test user's proposed AP
+ Web.wifiTest = WIFI_TESTING;
+
+ Web.save_data_counter = TasmotaGlobal.save_data_counter;
+ TasmotaGlobal.save_data_counter = 0; // Stop auto saving data - Updating Settings
+ Settings.save_data = 0;
+
+ Web.old_wificonfig = TasmotaGlobal.wifi_state_flag;
+ Settings.sta_config = WIFI_MANAGER;
+ TasmotaGlobal.wifi_state_flag = Settings.sta_config;
+
+ TasmotaGlobal.sleep = 0; // Disable sleep
+ TasmotaGlobal.restart_flag = 0; // No restart
+ TasmotaGlobal.ota_state_flag = 0; // No OTA
+// TasmotaGlobal.blinks = 0; // Disable blinks initiated by WifiManager
+
+ WebGetArg(PSTR("s1"), tmp, sizeof(tmp)); // SSID1
+ SettingsUpdateText(SET_STASSID1, tmp);
+ WebGetArg(PSTR("p1"), tmp, sizeof(tmp)); // PASSWORD1
+ SettingsUpdateText(SET_STAPWD1, tmp);
+
+ AddLog(LOG_LEVEL_INFO, PSTR(D_LOG_WIFI D_CONNECTING_TO_AP " %s " D_AS " %s ..."),
+ SettingsText(SET_STASSID1), TasmotaGlobal.hostname);
+
+ WiFi.begin(SettingsText(SET_STASSID1), SettingsText(SET_STAPWD1));
+
+ WebRestart(2);
+ } else {
+ // STATION MODE or MIXED
+ // Save the config and restart
+ WifiSaveSettings();
+ WebRestart(1);
+ }
return;
}
+ if ( WIFI_TEST_FINISHED_SUCCESSFUL == Web.wifiTest ) {
+ Web.wifiTest = WIFI_NOT_TESTING;
+#if (RESTART_AFTER_INITIAL_WIFI_CONFIG)
+ WebRestart(3);
+#else
+ HandleRoot();
+#endif
+ }
+
WSContentStart_P(PSTR(D_CONFIGURE_WIFI), !WifiIsInManagerMode());
WSContentSend_P(HTTP_SCRIPT_WIFI);
+ if (WifiIsInManagerMode()) { WSContentSend_P(HTTP_SCRIPT_HIDE); }
+ if (WIFI_TESTING == Web.wifiTest) { WSContentSend_P(HTTP_SCRIPT_RELOAD_TIME, HTTP_RESTART_RECONNECT_TIME); }
#ifdef USE_ENHANCED_GUI_WIFI_SCAN
WSContentSendStyle_P(HTTP_HEAD_STYLE_SSI, WebColor(COL_TEXT));
#else
WSContentSendStyle();
#endif // USE_ENHANCED_GUI_WIFI_SCAN
+ bool limitScannedNetworks = true;
if (HTTP_MANAGER_RESET_ONLY != Web.state) {
- if (Webserver->hasArg(F("scan"))) {
+ if (WIFI_TESTING == Web.wifiTest) {
+ limitScannedNetworks = false;
+ } else {
+ if (Webserver->hasArg(F("scan"))) { limitScannedNetworks = false; }
#ifdef USE_EMULATION
UdpDisconnect();
#endif // USE_EMULATION
@@ -1677,7 +1801,7 @@ void HandleWifiConfiguration(void) {
if (0 == n) {
AddLog(LOG_LEVEL_DEBUG, PSTR(D_LOG_WIFI D_NO_NETWORKS_FOUND));
WSContentSend_P(PSTR(D_NO_NETWORKS_FOUND));
- WSContentSend_P(PSTR(". " D_REFRESH_TO_SCAN_AGAIN "."));
+ limitScannedNetworks = false; // in order to show D_SCAN_FOR_WIFI_NETWORKS
} else {
//sort networks
int indices[n];
@@ -1685,7 +1809,6 @@ void HandleWifiConfiguration(void) {
indices[i] = i;
}
-
// RSSI SORT
for (uint32_t i = 0; i < n; i++) {
for (uint32_t j = i + 1; j < n; j++) {
@@ -1695,9 +1818,16 @@ void HandleWifiConfiguration(void) {
}
}
+ uint32_t networksToShow = n;
+ if ((limitScannedNetworks) && (networksToShow > MAX_WIFI_NETWORKS_TO_SHOW)) { networksToShow = MAX_WIFI_NETWORKS_TO_SHOW; }
+
+ if (WifiIsInManagerMode()) { WSContentSend_P(PSTR("%s"), HtmlEscape(ssid).c_str());
+ if (!limitScannedNetworks) {
+ WSContentSend_P(PSTR("
%s"), HtmlEscape(ssid).c_str());
+ }
+ skipduplicated = false;
String nextSSID = "";
// Handle all APs with the same SSID
for (uint32_t j = 0; j < n; j++) {
if ((indices[j] < n) && ((nextSSID = WiFi.SSID(indices[j])) == ssid)) {
- // Update RSSI / quality
- rssi = WiFi.RSSI(indices[j]);
- uint32_t rssi_as_quality = WifiGetRssiAsQuality(rssi);
- uint32_t num_bars = changeUIntScale(rssi_as_quality, 0, 100, 0, 4);
+ if (!skipduplicated) {
+ // Update RSSI / quality
+ rssi = WiFi.RSSI(indices[j]);
+ uint32_t rssi_as_quality = WifiGetRssiAsQuality(rssi);
+ uint32_t num_bars = changeUIntScale(rssi_as_quality, 0, 100, 0, 4);
- // Print item
- WSContentSend_P(PSTR("
%s
(%d) "),
- rssi, rssi_as_quality,
- WiFi.BSSIDstr(indices[j]).c_str(),
- WiFi.channel(indices[j])
- );
- // Print signal strength indicator
- for (uint32_t k = 0; k < 4; ++k) {
- WSContentSend_P(PSTR("
"), k, (num_bars < k) ? PSTR(" o30") : PSTR(""));
+ if (limitScannedNetworks) {
+ // Print SSID and item
+ WSContentSend_P(PSTR("
%s"), rssi, rssi_as_quality, HtmlEscape(ssid).c_str());
+ // Print signal strength indicator
+ for (uint32_t k = 0; k < 4; ++k) {
+ WSContentSend_P(PSTR(""), k, (num_bars < k) ? PSTR(" o30") : PSTR(""));
+ }
+ WSContentSend_P(PSTR("
"));
+ ssid_showed++;
+ skipduplicated = true; // For the simplified page, just show 1 SSID if there are many Networks with the same
+ } else {
+ // Print item
+ WSContentSend_P(PSTR("%s
(%d) "),
+ rssi, rssi_as_quality,
+ WiFi.BSSIDstr(indices[j]).c_str(),
+ WiFi.channel(indices[j])
+ );
+ // Print signal strength indicator
+ for (uint32_t k = 0; k < 4; ++k) {
+ WSContentSend_P(PSTR(""), k, (num_bars < k) ? PSTR(" o30") : PSTR(""));
+ }
+ WSContentSend_P(PSTR("
"));
}
+ }
+
+ if (limitScannedNetworks) {
+ WSContentSend_P(PSTR("
"));
} else {
WSContentSend_P(PSTR("
"));
}
// As WIFI_HOSTNAME may contain %s-%04d it cannot be part of HTTP_FORM_WIFI where it will exception
- WSContentSend_P(HTTP_FORM_WIFI, SettingsText(SET_STASSID1), SettingsText(SET_STASSID2), WIFI_HOSTNAME, WIFI_HOSTNAME, SettingsText(SET_HOSTNAME), SettingsText(SET_CORS));
+ if (WifiIsInManagerMode()) {
+ WSContentSend_P(HTTP_FORM_WIFI_INITIAL, SettingsText(SET_STASSID1) );
+ } else {
+ WSContentSend_P(HTTP_FORM_WIFI, SettingsText(SET_STASSID1), SettingsText(SET_STASSID2), WIFI_HOSTNAME, WIFI_HOSTNAME, SettingsText(SET_HOSTNAME), SettingsText(SET_CORS));
+ }
WSContentSend_P(HTTP_FORM_END);
}
if (WifiIsInManagerMode()) {
#ifndef FIRMWARE_MINIMAL
- WSContentSpaceButton(BUTTON_RESTORE);
- WSContentButton(BUTTON_RESET_CONFIGURATION);
+ if (WIFI_TESTING == Web.wifiTest) {
+ WSContentSend_P(PSTR("" D_TRYING_TO_CONNECT "
%s
"),
+ WebColor(COL_TEXT_WARNING),
+ SettingsText(SET_STASSID1)
+ );
+ } else if (WIFI_TEST_FINISHED_BAD == Web.wifiTest) {
+ WSContentSend_P(PSTR("" D_CONNECT_FAILED_TO " %s
" D_CHECK_CREDENTIALS "
"),
+ WebColor(COL_TEXT_WARNING),
+ SettingsText(SET_STASSID1)
+ );
+ }
+ // More Options Button
+ WSContentSend_P(PSTR(""),
+ (WIFI_TEST_FINISHED_BAD == Web.wifiTest) ? "none" : Web.initial_config ? "block" : "none", Web.initial_config ? "block" : "none"
+ );
+ WSContentSpaceButton(BUTTON_RESTORE, !Web.initial_config);
+ WSContentButton(BUTTON_RESET_CONFIGURATION, !Web.initial_config);
#endif // FIRMWARE_MINIMAL
- WSContentSpaceButton(BUTTON_RESTART);
+ WSContentSpaceButton(BUTTON_RESTART, !Web.initial_config);
} else {
WSContentSpaceButton(BUTTON_CONFIGURATION);
}
@@ -3116,6 +3287,47 @@ bool Xdrv01(uint8_t function)
if (Settings.flag2.emulation) { PollUdp(); }
#endif // USE_EMULATION
break;
+ case FUNC_EVERY_SECOND:
+ if (Web.initial_config) {
+ Wifi.config_counter = 200; // Do not restart the device if it has SSId Blank
+ }
+ if (Web.wifi_test_counter) {
+ Web.wifi_test_counter--;
+ AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_WIFI D_TRYING_TO_CONNECT " %s"), SettingsText(SET_STASSID1));
+ if ( WifiCheck_hasIP(WiFi.localIP()) ) { // Got IP - Connection Established
+ Web.wifi_test_counter = 0;
+ Web.wifiTest = WIFI_TEST_FINISHED_SUCCESSFUL;
+ AddLog_P(LOG_LEVEL_INFO, PSTR(D_LOG_WIFI D_CMND_SSID "1 %s: " D_CONNECTED " - " D_IP_ADDRESS " %_I"), SettingsText(SET_STASSID1), (uint32_t)WiFi.localIP());
+// TasmotaGlobal.blinks = 255; // Signal wifi connection with blinks
+ Settings.sta_config = Web.old_wificonfig;
+ TasmotaGlobal.wifi_state_flag = Settings.sta_config;
+ TasmotaGlobal.save_data_counter = Web.save_data_counter;
+ Settings.save_data = Web.save_data_counter;
+ SettingsSaveAll();
+#if (!RESTART_AFTER_INITIAL_WIFI_CONFIG)
+ Web.initial_config = false;
+ Web.state = HTTP_ADMIN;
+#endif
+ } else if (!Web.wifi_test_counter) { // Test TimeOut
+ Web.wifi_test_counter = 0;
+ Web.wifiTest = WIFI_TEST_FINISHED_BAD;
+ switch (WiFi.status()) {
+ case WL_CONNECTED:
+ AddLog(LOG_LEVEL_INFO, PSTR(D_LOG_WIFI D_CONNECT_FAILED_NO_IP_ADDRESS));
+ break;
+ case WL_NO_SSID_AVAIL:
+ AddLog(LOG_LEVEL_INFO, PSTR(D_LOG_WIFI D_CONNECT_FAILED_AP_NOT_REACHED));
+ break;
+ case WL_CONNECT_FAILED:
+ AddLog(LOG_LEVEL_INFO, PSTR(D_LOG_WIFI D_CONNECT_FAILED_WRONG_PASSWORD));
+ break;
+ default: // WL_IDLE_STATUS and WL_DISCONNECTED
+ AddLog(LOG_LEVEL_INFO, PSTR(D_LOG_WIFI D_CONNECT_FAILED_AP_TIMEOUT));
+ }
+ int n = WiFi.scanNetworks(); // restart scan
+ }
+ }
+ break;
case FUNC_COMMAND:
result = DecodeCommand(kWebCommands, WebCommand);
break;