mirror of
https://github.com/Laxilef/OTGateway.git
synced 2026-02-04 16:47:44 +05:00
refactor: migrating from Telnet to WebSerial for remote logging
This commit is contained in:
@@ -6,7 +6,6 @@ extern NetworkMgr* network;
|
||||
extern MqttTask* tMqtt;
|
||||
extern OpenThermTask* tOt;
|
||||
extern FileData fsNetworkSettings, fsSettings, fsSensorsSettings;
|
||||
extern ESPTelnetStream* telnetStream;
|
||||
|
||||
|
||||
class MainTask : public Task {
|
||||
@@ -40,7 +39,6 @@ protected:
|
||||
PumpStartReason extPumpStartReason = PumpStartReason::NONE;
|
||||
unsigned long externalPumpStartTime = 0;
|
||||
bool ntpStarted = false;
|
||||
bool telnetStarted = false;
|
||||
bool emergencyDetected = false;
|
||||
unsigned long emergencyFlipTime = 0;
|
||||
bool freezeDetected = false;
|
||||
@@ -106,9 +104,9 @@ protected:
|
||||
vars.network.connected = network->isConnected();
|
||||
vars.network.rssi = network->isConnected() ? WiFi.RSSI() : 0;
|
||||
|
||||
if (settings.system.logLevel >= TinyLogger::Level::SILENT && settings.system.logLevel <= TinyLogger::Level::VERBOSE) {
|
||||
if (settings.system.logLevel >= TinyLoggerLevel::SILENT && settings.system.logLevel <= TinyLoggerLevel::VERBOSE) {
|
||||
if (Log.getLevel() != settings.system.logLevel) {
|
||||
Log.setLevel(static_cast<TinyLogger::Level>(settings.system.logLevel));
|
||||
Log.setLevel(static_cast<TinyLoggerLevel>(settings.system.logLevel));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -123,11 +121,6 @@ protected:
|
||||
}
|
||||
}
|
||||
|
||||
if (!this->telnetStarted && telnetStream != nullptr) {
|
||||
telnetStream->begin(23, false);
|
||||
this->telnetStarted = true;
|
||||
}
|
||||
|
||||
if (settings.mqtt.enabled && !tMqtt->isEnabled()) {
|
||||
tMqtt->enable();
|
||||
|
||||
@@ -142,11 +135,6 @@ protected:
|
||||
this->ntpStarted = false;
|
||||
}
|
||||
|
||||
if (this->telnetStarted) {
|
||||
telnetStream->stop();
|
||||
this->telnetStarted = false;
|
||||
}
|
||||
|
||||
if (tMqtt->isEnabled()) {
|
||||
tMqtt->disable();
|
||||
}
|
||||
@@ -160,23 +148,10 @@ protected:
|
||||
}
|
||||
this->ledStatus();
|
||||
|
||||
// telnet
|
||||
if (this->telnetStarted) {
|
||||
this->yield();
|
||||
telnetStream->loop();
|
||||
this->yield();
|
||||
}
|
||||
|
||||
|
||||
// anti memory leak
|
||||
for (Stream* stream : Log.getStreams()) {
|
||||
while (stream->available() > 0) {
|
||||
stream->read();
|
||||
|
||||
#ifdef ARDUINO_ARCH_ESP8266
|
||||
::optimistic_yield(1000);
|
||||
#endif
|
||||
}
|
||||
while (Serial.available() > 0) {
|
||||
Serial.read();
|
||||
}
|
||||
|
||||
// heap info
|
||||
@@ -215,7 +190,7 @@ protected:
|
||||
vars.states.restarting = true;
|
||||
}
|
||||
|
||||
if (settings.system.logLevel < TinyLogger::Level::VERBOSE) {
|
||||
if (settings.system.logLevel < TinyLoggerLevel::VERBOSE) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user