jeka/OTGateway
1
0
Fork 0
mirror of https://github.com/Laxilef/OTGateway.git synced 2025-12-11 02:34:29 +05:00
Code Issues Packages Projects Releases Wiki Activity

fix: conflicts with sdk 3.x.x for esp32 fixed

Browse Source
This commit is contained in:
Yurii
2024-06-05 23:11:27 +03:00
parent 59eb05726a
commit b600c130f0
6 changed files with 56 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/MainTask.h
View File

@@ -1,6 +1,8 @@
#include <Blinker.h>
extern Network::Manager* network;
using namespace NetworkUtils;
extern NetworkMgr* network;
extern MqttTask* tMqtt;
extern OpenThermTask* tOt;
extern FileData fsSettings, fsNetworkSettings;

8
src/PortalTask.h
View File

@@ -14,7 +14,9 @@ using WebServer = ESP8266WebServer;
#include <UpgradeHandler.h>
#include <DNSServer.h>
extern Network::Manager* network;
using namespace NetworkUtils;
extern NetworkMgr* network;
extern FileData fsSettings, fsNetworkSettings;
extern MqttTask* tMqtt;
@@ -359,7 +361,7 @@ protected:
for (short int i = 0; i < apCount; i++) {
String ssid = WiFi.SSID(i);
doc[i]["ssid"] = ssid;
doc[i]["signalQuality"] = Network::Manager::rssiToSignalQuality(WiFi.RSSI(i));
doc[i]["signalQuality"] = NetworkMgr::rssiToSignalQuality(WiFi.RSSI(i));
doc[i]["channel"] = WiFi.channel(i);
doc[i]["hidden"] = !ssid.length();
doc[i]["encryptionType"] = WiFi.encryptionType(i);
@@ -496,7 +498,7 @@ protected:
doc["network"]["mac"] = network->getStaMac();
doc["network"]["connected"] = isConnected;
doc["network"]["ssid"] = network->getStaSsid();
doc["network"]["signalQuality"] = isConnected ? Network::Manager::rssiToSignalQuality(network->getRssi()) : 0;
doc["network"]["signalQuality"] = isConnected ? NetworkMgr::rssiToSignalQuality(network->getRssi()) : 0;
doc["network"]["channel"] = isConnected ? network->getStaChannel() : 0;
doc["network"]["ip"] = isConnected ? network->getStaIp().toString() : "";
doc["network"]["subnet"] = isConnected ? network->getStaSubnet().toString() : "";

12
src/main.cpp
View File

@@ -4,11 +4,11 @@
#include <ArduinoJson.h>
#include <FileData.h>
#include <LittleFS.h>
#include "ESPTelnetStream.h"
#include <ESPTelnetStream.h>
#include <TinyLogger.h>
#include <NetworkManager.h>
#include <NetworkMgr.h>
#include "Settings.h"
#include <utils.h>
#include "utils.h"
#if defined(ARDUINO_ARCH_ESP32)
#include <ESP32Scheduler.h>
@@ -27,11 +27,13 @@
#include "PortalTask.h"
#include "MainTask.h"
using namespace NetworkUtils;
// Vars
FileData fsNetworkSettings(&LittleFS, "/network.conf", 'n', &networkSettings, sizeof(networkSettings), 1000);
FileData fsSettings(&LittleFS, "/settings.conf", 's', &settings, sizeof(settings), 60000);
ESPTelnetStream* telnetStream = nullptr;
Network::Manager* network = nullptr;
NetworkMgr* network = nullptr;
// Tasks
MqttTask* tMqtt;
@@ -130,7 +132,7 @@ void setup() {
Log.setLevel(settings.system.debug ? TinyLogger::Level::VERBOSE : TinyLogger::Level::INFO);
// network
network = (new Network::Manager)
network = (new NetworkMgr)
->setHostname(networkSettings.hostname)
->setStaCredentials(
#ifdef WOKWI