Reading wifi creds from eeprom, fixed ota filenames
This commit is contained in:
parent
e54c1d2518
commit
fcfc8df625
25
src/wifi.cpp
25
src/wifi.cpp
@ -69,16 +69,21 @@ bool WifiConnection::hasConfig() {
|
|||||||
// Check if there are stored WIFI Settings we can use.
|
// Check if there are stored WIFI Settings we can use.
|
||||||
#if defined(ESP8266)
|
#if defined(ESP8266)
|
||||||
String ssid = WiFi.SSID();
|
String ssid = WiFi.SSID();
|
||||||
|
String pwd = WiFi.psk();
|
||||||
|
#else
|
||||||
|
ESP_WiFiManager wifiMgr;
|
||||||
|
String ssid = wifiMgr.WiFi_SSID();
|
||||||
|
String pwd = wifiMgr.WiFi_Pass();
|
||||||
|
#endif
|
||||||
if (ssid.length()) {
|
if (ssid.length()) {
|
||||||
Log.notice(F("WIFI: Found credentials in EEPORM." CR));
|
Log.notice(F("WIFI: Found stored credentials." CR));
|
||||||
myConfig.setWifiSSID(ssid, 0);
|
myConfig.setWifiSSID(ssid, 0);
|
||||||
|
|
||||||
if (WiFi.psk().length()) myConfig.setWifiPass(WiFi.psk(), 0);
|
if (pwd.length()) myConfig.setWifiPass(pwd, 0);
|
||||||
|
|
||||||
myConfig.saveFile();
|
myConfig.saveFile();
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -101,10 +106,6 @@ void WifiConnection::startPortal() {
|
|||||||
pinMode(PIN_LED, OUTPUT);
|
pinMode(PIN_LED, OUTPUT);
|
||||||
digitalWrite(PIN_LED, LOW);
|
digitalWrite(PIN_LED, LOW);
|
||||||
|
|
||||||
#if defined(ESP32C3)
|
|
||||||
WiFi.setTxPower(WIFI_POWER_8_5dBm); // Required for ESP32C3 Mini
|
|
||||||
#endif
|
|
||||||
|
|
||||||
myWifiManager = new ESP_WiFiManager(WIFI_MDNS);
|
myWifiManager = new ESP_WiFiManager(WIFI_MDNS);
|
||||||
myWifiManager->setMinimumSignalQuality(-1);
|
myWifiManager->setMinimumSignalQuality(-1);
|
||||||
myWifiManager->setConfigPortalChannel(0);
|
myWifiManager->setConfigPortalChannel(0);
|
||||||
@ -117,6 +118,11 @@ void WifiConnection::startPortal() {
|
|||||||
ESP_WMParameter deviceName(mdns.c_str());
|
ESP_WMParameter deviceName(mdns.c_str());
|
||||||
myWifiManager->addParameter(&deviceName);
|
myWifiManager->addParameter(&deviceName);
|
||||||
|
|
||||||
|
#if defined(ESP32C3)
|
||||||
|
Log.notice(F("WIFI: Reducing wifi power for c3 chip." CR));
|
||||||
|
WiFi.setTxPower(WIFI_POWER_8_5dBm); // Required for ESP32C3 Mini
|
||||||
|
#endif
|
||||||
|
|
||||||
myWifiManager->startConfigPortal(WIFI_DEFAULT_SSID, WIFI_DEFAULT_PWD);
|
myWifiManager->startConfigPortal(WIFI_DEFAULT_SSID, WIFI_DEFAULT_PWD);
|
||||||
|
|
||||||
if (myWifiManager->getSSID(0).length()) {
|
if (myWifiManager->getSSID(0).length()) {
|
||||||
@ -152,6 +158,7 @@ void WifiConnection::connectAsync(int wifiIndex) {
|
|||||||
WiFi.mode(WIFI_STA);
|
WiFi.mode(WIFI_STA);
|
||||||
|
|
||||||
#if defined(ESP32C3)
|
#if defined(ESP32C3)
|
||||||
|
Log.notice(F("WIFI: Reducing wifi power for c3 chip." CR));
|
||||||
WiFi.setTxPower(WIFI_POWER_8_5dBm); // Required for ESP32C3 Mini
|
WiFi.setTxPower(WIFI_POWER_8_5dBm); // Required for ESP32C3 Mini
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@ -292,6 +299,10 @@ bool WifiConnection::updateFirmware() {
|
|||||||
String serverPath = myConfig.getOtaURL();
|
String serverPath = myConfig.getOtaURL();
|
||||||
#if defined(ESP8266)
|
#if defined(ESP8266)
|
||||||
serverPath += "firmware.bin";
|
serverPath += "firmware.bin";
|
||||||
|
#elif defined(ESP32C3)
|
||||||
|
serverPath += "firmware32c3.bin";
|
||||||
|
#elif defined(ESP32S2)
|
||||||
|
serverPath += "firmware32s2.bin";
|
||||||
#else // defined (ESP32)
|
#else // defined (ESP32)
|
||||||
serverPath += "firmware32.bin";
|
serverPath += "firmware32.bin";
|
||||||
#endif
|
#endif
|
||||||
|
Loading…
Reference in New Issue
Block a user