andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-06 15:59:52 +03:00
Code Issues Packages Projects Releases Wiki Activity

remove static functions from System class

Browse Source
This commit is contained in:
proddy
2021-03-01 22:21:18 +01:00
parent a092d83fad
commit ea5b6e5c58
17 changed files with 62 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/framework/APSettingsService.cpp
View File

@@ -1,5 +1,7 @@
#include <APSettingsService.h>
#include "../../src/emsesp_stub.hpp" // proddy added
APSettingsService::APSettingsService(AsyncWebServer * server, FS * fs, SecurityManager * securityManager)
: _httpEndpoint(APSettings::read, APSettings::update, this, server, AP_SETTINGS_SERVICE_PATH, securityManager)
, _fsPersistence(APSettings::read, APSettings::update, this, fs, AP_SETTINGS_FILE)
@@ -21,7 +23,7 @@ void APSettingsService::reconfigureAP() {
void APSettingsService::loop() {
// if we have an ETH connection, quit
if (emsesp::System::ethernet_connected()) {
if (emsesp::EMSESP::system_.ethernet_connected()) {
return;
}
unsigned long currentMillis = uuid::get_uptime();
@@ -51,8 +53,8 @@ void APSettingsService::startAP() {
WiFi.softAP(_state.ssid.c_str(), _state.password.c_str());
if (!_dnsServer) {
IPAddress apIp = WiFi.softAPIP();
Serial.print(F("Starting captive portal on "));
Serial.println(apIp);
// Serial.print(F("Starting captive portal on "));
// Serial.println(apIp);
_dnsServer = new DNSServer;
_dnsServer->start(DNS_PORT, "*", apIp);
}
@@ -60,7 +62,7 @@ void APSettingsService::startAP() {
void APSettingsService::stopAP() {
if (_dnsServer) {
Serial.println(F("Stopping captive portal"));
// Serial.println(F("Stopping captive portal"));
_dnsServer->stop();
delete _dnsServer;
_dnsServer = nullptr;