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

refactoring

Browse Source
This commit is contained in:
Yurii
2023-12-07 02:57:06 +03:00
parent 45630c3be9
commit 85cd37c4ae
2 changed files with 68 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/MainTask.h
View File

@@ -113,6 +113,7 @@ protected:
tOt->enable(); tOt->enable();
} }
yield();
#ifdef LED_STATUS_PIN #ifdef LED_STATUS_PIN
ledStatus(LED_STATUS_PIN); ledStatus(LED_STATUS_PIN);
#endif #endif
@@ -120,6 +121,7 @@ protected:
externalPump(); externalPump();
// anti memory leak // anti memory leak
yield();
if (Log.lock()) { if (Log.lock()) {
for (Stream* stream : Log.getStreams()) { for (Stream* stream : Log.getStreams()) {
while (stream->available() > 0) { while (stream->available() > 0) {

113
src/WifiManagerTask.h
View File

@@ -42,6 +42,9 @@ extern EEManager eeSettings;
extern ESPTelnetStream TelnetStream; extern ESPTelnetStream TelnetStream;
#endif #endif
const char S_WIFI[] PROGMEM = "WIFI";
const char S_WIFI_SETTINGS[] PROGMEM = "WIFI.SETTINGS";
class WifiManagerTask : public Task { class WifiManagerTask : public Task {
public: public:
@@ -207,7 +210,7 @@ protected:
TelnetStream.stop(); TelnetStream.stop();
#endif #endif
Log.sinfoln("WIFI", F("Disconnected")); Log.sinfoln(FPSTR(S_WIFI), F("Disconnected"));
} else if (!connected && WiFi.status() == WL_CONNECTED) { } else if (!connected && WiFi.status() == WL_CONNECTED) {
connected = true; connected = true;
@@ -227,7 +230,7 @@ protected:
TelnetStream.begin(23, false); TelnetStream.begin(23, false);
#endif #endif
Log.sinfoln("WIFI", F("Connected. IP: %s, RSSI: %d"), WiFi.localIP().toString().c_str(), WiFi.RSSI()); Log.sinfoln(FPSTR(S_WIFI), F("Connected. IP: %s, RSSI: %hh"), WiFi.localIP().toString().c_str(), WiFi.RSSI());
} }
#if defined(ESP8266) #if defined(ESP8266)
@@ -248,77 +251,107 @@ protected:
changed = true; changed = true;
needRestart = true; needRestart = true;
strcpy(settings.hostname, wmHostname->getValue()); strcpy(settings.hostname, wmHostname->getValue());
Log.sinfoln(FPSTR(S_WIFI_SETTINGS), F("New hostname: %s"), settings.hostname);
} }
if (strcmp(wmMqttServer->getValue(), settings.mqtt.server) != 0) { if (strcmp(wmMqttServer->getValue(), settings.mqtt.server) != 0) {
changed = true; changed = true;
strcpy(settings.mqtt.server, wmMqttServer->getValue()); strcpy(settings.mqtt.server, wmMqttServer->getValue());
Log.sinfoln(FPSTR(S_WIFI_SETTINGS), F("New mqtt.server: %s"), settings.mqtt.server);
} }
if (wmMqttPort->getValue() != settings.mqtt.port) { if (wmMqttPort->getValue() != settings.mqtt.port) {
changed = true; changed = true;
settings.mqtt.port = wmMqttPort->getValue(); settings.mqtt.port = wmMqttPort->getValue();
Log.sinfoln(FPSTR(S_WIFI_SETTINGS), F("New mqtt.port: %du"), settings.mqtt.port);
} }
if (strcmp(wmMqttUser->getValue(), settings.mqtt.user) != 0) { if (strcmp(wmMqttUser->getValue(), settings.mqtt.user) != 0) {
changed = true; changed = true;
strcpy(settings.mqtt.user, wmMqttUser->getValue()); strcpy(settings.mqtt.user, wmMqttUser->getValue());
Log.sinfoln(FPSTR(S_WIFI_SETTINGS), F("New mqtt.user: %s"), settings.mqtt.user);
} }
if (strcmp(wmMqttPassword->getValue(), settings.mqtt.password) != 0) { if (strcmp(wmMqttPassword->getValue(), settings.mqtt.password) != 0) {
changed = true; changed = true;
strcpy(settings.mqtt.password, wmMqttPassword->getValue()); strcpy(settings.mqtt.password, wmMqttPassword->getValue());
Log.sinfoln(FPSTR(S_WIFI_SETTINGS), F("New mqtt.password: %s"), settings.mqtt.password);
} }
if (strcmp(wmMqttPrefix->getValue(), settings.mqtt.prefix) != 0) { if (strcmp(wmMqttPrefix->getValue(), settings.mqtt.prefix) != 0) {
changed = true; changed = true;
strcpy(settings.mqtt.prefix, wmMqttPrefix->getValue()); strcpy(settings.mqtt.prefix, wmMqttPrefix->getValue());
Log.sinfoln(FPSTR(S_WIFI_SETTINGS), F("New mqtt.prefix: %s"), settings.mqtt.prefix);
} }
if (wmMqttPublishInterval->getValue() != settings.mqtt.interval) { if (wmMqttPublishInterval->getValue() != settings.mqtt.interval) {
changed = true; changed = true;
settings.mqtt.interval = wmMqttPublishInterval->getValue(); settings.mqtt.interval = wmMqttPublishInterval->getValue();
Log.sinfoln(FPSTR(S_WIFI_SETTINGS), F("New mqtt.interval: %du"), settings.mqtt.interval);
} }
if (wmOtInPin->getValue() != settings.opentherm.inPin) { if (wmOtInPin->getValue() != settings.opentherm.inPin) {
changed = true; changed = true;
needRestart = true; needRestart = true;
settings.opentherm.inPin = wmOtInPin->getValue(); settings.opentherm.inPin = wmOtInPin->getValue();
Log.sinfoln(FPSTR(S_WIFI_SETTINGS), F("New opentherm.inPin: %hhu"), settings.opentherm.inPin);
} }
if (wmOtOutPin->getValue() != settings.opentherm.outPin) { if (wmOtOutPin->getValue() != settings.opentherm.outPin) {
changed = true; changed = true;
needRestart = true; needRestart = true;
settings.opentherm.outPin = wmOtOutPin->getValue(); settings.opentherm.outPin = wmOtOutPin->getValue();
Log.sinfoln(FPSTR(S_WIFI_SETTINGS), F("New opentherm.outPin: %hhu"), settings.opentherm.outPin);
} }
if (wmOtMemberIdCode->getValue() != settings.opentherm.memberIdCode) { if (wmOtMemberIdCode->getValue() != settings.opentherm.memberIdCode) {
changed = true; changed = true;
settings.opentherm.memberIdCode = wmOtMemberIdCode->getValue(); settings.opentherm.memberIdCode = wmOtMemberIdCode->getValue();
Log.sinfoln(FPSTR(S_WIFI_SETTINGS), F("New opentherm.memberIdCode: %du"), settings.opentherm.memberIdCode);
} }
if (wmOtDhwPresent->getCheckboxValue() != settings.opentherm.dhwPresent) { if (wmOtDhwPresent->getCheckboxValue() != settings.opentherm.dhwPresent) {
changed = true; changed = true;
settings.opentherm.dhwPresent = wmOtDhwPresent->getCheckboxValue(); settings.opentherm.dhwPresent = wmOtDhwPresent->getCheckboxValue();
Log.sinfoln(FPSTR(S_WIFI_SETTINGS), F("New opentherm.dhwPresent: %s"), settings.opentherm.dhwPresent ? "on" : "off");
} }
if (wmOtSummerWinterMode->getCheckboxValue() != settings.opentherm.summerWinterMode) { if (wmOtSummerWinterMode->getCheckboxValue() != settings.opentherm.summerWinterMode) {
changed = true; changed = true;
settings.opentherm.summerWinterMode = wmOtSummerWinterMode->getCheckboxValue(); settings.opentherm.summerWinterMode = wmOtSummerWinterMode->getCheckboxValue();
Log.sinfoln(FPSTR(S_WIFI_SETTINGS), F("New opentherm.summerWinterMode: %s"), settings.opentherm.summerWinterMode ? "on" : "off");
} }
if (wmOtHeatingCh2Enabled->getCheckboxValue() != settings.opentherm.heatingCh2Enabled) { if (wmOtHeatingCh2Enabled->getCheckboxValue() != settings.opentherm.heatingCh2Enabled) {
changed = true; changed = true;
settings.opentherm.heatingCh2Enabled = wmOtHeatingCh2Enabled->getCheckboxValue(); settings.opentherm.heatingCh2Enabled = wmOtHeatingCh2Enabled->getCheckboxValue();
Log.sinfoln(FPSTR(S_WIFI_SETTINGS), F("New opentherm.heatingCh2Enabled: %s"), settings.opentherm.heatingCh2Enabled ? "on" : "off");
if (settings.opentherm.heatingCh1ToCh2) { if (settings.opentherm.heatingCh1ToCh2) {
settings.opentherm.heatingCh1ToCh2 = false; settings.opentherm.heatingCh1ToCh2 = false;
wmOtHeatingCh1ToCh2->setValue(false); wmOtHeatingCh1ToCh2->setValue(false);
Log.sinfoln(FPSTR(S_WIFI_SETTINGS), F("New opentherm.heatingCh1ToCh2: %s"), settings.opentherm.heatingCh1ToCh2 ? "on" : "off");
} }
if (settings.opentherm.dhwToCh2) { if (settings.opentherm.dhwToCh2) {
settings.opentherm.dhwToCh2 = false; settings.opentherm.dhwToCh2 = false;
wmOtDhwToCh2->setValue(false); wmOtDhwToCh2->setValue(false);
Log.sinfoln(FPSTR(S_WIFI_SETTINGS), F("New opentherm.dhwToCh2: %s"), settings.opentherm.dhwToCh2 ? "on" : "off");
} }
} }
@@ -326,14 +359,20 @@ protected:
changed = true; changed = true;
settings.opentherm.heatingCh1ToCh2 = wmOtHeatingCh1ToCh2->getCheckboxValue(); settings.opentherm.heatingCh1ToCh2 = wmOtHeatingCh1ToCh2->getCheckboxValue();
Log.sinfoln(FPSTR(S_WIFI_SETTINGS), F("New opentherm.heatingCh1ToCh2: %s"), settings.opentherm.heatingCh1ToCh2 ? "on" : "off");
if (settings.opentherm.heatingCh2Enabled) { if (settings.opentherm.heatingCh2Enabled) {
settings.opentherm.heatingCh2Enabled = false; settings.opentherm.heatingCh2Enabled = false;
wmOtHeatingCh2Enabled->setValue(false); wmOtHeatingCh2Enabled->setValue(false);
Log.sinfoln(FPSTR(S_WIFI_SETTINGS), F("New opentherm.heatingCh2Enabled: %s"), settings.opentherm.heatingCh2Enabled ? "on" : "off");
} }
if (settings.opentherm.dhwToCh2) { if (settings.opentherm.dhwToCh2) {
settings.opentherm.dhwToCh2 = false; settings.opentherm.dhwToCh2 = false;
wmOtDhwToCh2->setValue(false); wmOtDhwToCh2->setValue(false);
Log.sinfoln(FPSTR(S_WIFI_SETTINGS), F("New opentherm.dhwToCh2: %s"), settings.opentherm.dhwToCh2 ? "on" : "off");
} }
} }
@@ -341,115 +380,95 @@ protected:
changed = true; changed = true;
settings.opentherm.dhwToCh2 = wmOtDhwToCh2->getCheckboxValue(); settings.opentherm.dhwToCh2 = wmOtDhwToCh2->getCheckboxValue();
Log.sinfoln(FPSTR(S_WIFI_SETTINGS), F("New opentherm.dhwToCh2: %s"), settings.opentherm.dhwToCh2 ? "on" : "off");
if (settings.opentherm.heatingCh2Enabled) { if (settings.opentherm.heatingCh2Enabled) {
settings.opentherm.heatingCh2Enabled = false; settings.opentherm.heatingCh2Enabled = false;
wmOtHeatingCh2Enabled->setValue(false); wmOtHeatingCh2Enabled->setValue(false);
Log.sinfoln(FPSTR(S_WIFI_SETTINGS), F("New opentherm.heatingCh2Enabled: %s"), settings.opentherm.heatingCh2Enabled ? "on" : "off");
} }
if (settings.opentherm.heatingCh1ToCh2) { if (settings.opentherm.heatingCh1ToCh2) {
settings.opentherm.heatingCh1ToCh2 = false; settings.opentherm.heatingCh1ToCh2 = false;
wmOtHeatingCh1ToCh2->setValue(false); wmOtHeatingCh1ToCh2->setValue(false);
Log.sinfoln(FPSTR(S_WIFI_SETTINGS), F("New opentherm.heatingCh1ToCh2: %s"), settings.opentherm.heatingCh1ToCh2 ? "on" : "off");
} }
} }
if (wmOtDhwBlocking->getCheckboxValue() != settings.opentherm.dhwBlocking) { if (wmOtDhwBlocking->getCheckboxValue() != settings.opentherm.dhwBlocking) {
changed = true; changed = true;
settings.opentherm.dhwBlocking = wmOtDhwBlocking->getCheckboxValue(); settings.opentherm.dhwBlocking = wmOtDhwBlocking->getCheckboxValue();
Log.sinfoln(FPSTR(S_WIFI_SETTINGS), F("New opentherm.dhwBlocking: %s"), settings.opentherm.dhwBlocking ? "on" : "off");
} }
if (wmOtModSyncWithHeating->getCheckboxValue() != settings.opentherm.modulationSyncWithHeating) { if (wmOtModSyncWithHeating->getCheckboxValue() != settings.opentherm.modulationSyncWithHeating) {
changed = true; changed = true;
settings.opentherm.modulationSyncWithHeating = wmOtModSyncWithHeating->getCheckboxValue(); settings.opentherm.modulationSyncWithHeating = wmOtModSyncWithHeating->getCheckboxValue();
Log.sinfoln(FPSTR(S_WIFI_SETTINGS), F("New opentherm.modulationSyncWithHeating: %s"), settings.opentherm.modulationSyncWithHeating ? "on" : "off");
} }
if (wmOutdoorSensorPin->getValue() != settings.sensors.outdoor.pin) { if (wmOutdoorSensorPin->getValue() != settings.sensors.outdoor.pin) {
changed = true; changed = true;
needRestart = true; needRestart = true;
settings.sensors.outdoor.pin = wmOutdoorSensorPin->getValue(); settings.sensors.outdoor.pin = wmOutdoorSensorPin->getValue();
Log.sinfoln(FPSTR(S_WIFI_SETTINGS), F("New sensors.outdoor.pin: %hhu"), settings.sensors.outdoor.pin);
} }
if (wmIndoorSensorPin->getValue() != settings.sensors.indoor.pin) { if (wmIndoorSensorPin->getValue() != settings.sensors.indoor.pin) {
changed = true; changed = true;
needRestart = true; needRestart = true;
settings.sensors.indoor.pin = wmIndoorSensorPin->getValue(); settings.sensors.indoor.pin = wmIndoorSensorPin->getValue();
Log.sinfoln(FPSTR(S_WIFI_SETTINGS), F("New sensors.indoor.pin: %hhu"), settings.sensors.indoor.pin);
} }
if (wmExtPumpUse->getCheckboxValue() != settings.externalPump.use) { if (wmExtPumpUse->getCheckboxValue() != settings.externalPump.use) {
changed = true; changed = true;
settings.externalPump.use = wmExtPumpUse->getCheckboxValue(); settings.externalPump.use = wmExtPumpUse->getCheckboxValue();
Log.sinfoln(FPSTR(S_WIFI_SETTINGS), F("New externalPump.use: %s"), settings.externalPump.use ? "on" : "off");
} }
if (wmExtPumpPin->getValue() != settings.externalPump.pin) { if (wmExtPumpPin->getValue() != settings.externalPump.pin) {
changed = true; changed = true;
needRestart = true; needRestart = true;
settings.externalPump.pin = wmExtPumpPin->getValue(); settings.externalPump.pin = wmExtPumpPin->getValue();
Log.sinfoln(FPSTR(S_WIFI_SETTINGS), F("New externalPump.pin: %hhu"), settings.externalPump.pin);
} }
if (wmExtPumpPostCirculationTime->getValue() != settings.externalPump.postCirculationTime) { if (wmExtPumpPostCirculationTime->getValue() != settings.externalPump.postCirculationTime) {
changed = true; changed = true;
settings.externalPump.postCirculationTime = wmExtPumpPostCirculationTime->getValue(); settings.externalPump.postCirculationTime = wmExtPumpPostCirculationTime->getValue();
Log.sinfoln(FPSTR(S_WIFI_SETTINGS), F("New externalPump.postCirculationTime: %hu"), settings.externalPump.postCirculationTime);
} }
if (wmExtPumpAntiStuckInterval->getValue() != settings.externalPump.antiStuckInterval) { if (wmExtPumpAntiStuckInterval->getValue() != settings.externalPump.antiStuckInterval) {
changed = true; changed = true;
settings.externalPump.antiStuckInterval = wmExtPumpAntiStuckInterval->getValue(); settings.externalPump.antiStuckInterval = wmExtPumpAntiStuckInterval->getValue();
Log.sinfoln(FPSTR(S_WIFI_SETTINGS), F("New externalPump.antiStuckInterval: %du"), settings.externalPump.antiStuckInterval);
} }
if (wmExtPumpAntiStuckTime->getValue() != settings.externalPump.antiStuckTime) { if (wmExtPumpAntiStuckTime->getValue() != settings.externalPump.antiStuckTime) {
changed = true; changed = true;
settings.externalPump.antiStuckTime = wmExtPumpAntiStuckTime->getValue(); settings.externalPump.antiStuckTime = wmExtPumpAntiStuckTime->getValue();
Log.sinfoln(FPSTR(S_WIFI_SETTINGS), F("New externalPump.antiStuckTime: %hu"), settings.externalPump.antiStuckTime);
} }
if (!changed) { if (!changed) {
return; return;
} } else if (needRestart) {
if (needRestart) {
vars.actions.restart = true; vars.actions.restart = true;
} }
Log.sinfo(
"WIFI",
F("New settings:\r\n"
" Hostname: %s\r\n"
" Mqtt server: %s:%d\r\n"
" Mqtt user: %s\r\n"
" Mqtt pass: %s\r\n"
" Mqtt prefix: %s\r\n"
" Mqtt publish interval: %d\r\n"
" OT in pin: %d\r\n"
" OT out pin: %d\r\n"
" OT member id code: %d\r\n"
" OT DHW present: %d\r\n"
" OT summer/winter mode: %d\r\n"
" OT heating ch2 enabled: %d\r\n"
" OT heating ch1 to ch2: %d\r\n"
" OT DHW to ch2: %d\r\n"
" OT DHW blocking: %d\r\n"
" OT modulation sync with heating: %d\r\n"
" Outdoor sensor pin: %d\r\n"
" Indoor sensor pin: %d\r\n"),
settings.hostname,
settings.mqtt.server,
settings.mqtt.port,
settings.mqtt.user,
settings.mqtt.password,
settings.mqtt.prefix,
settings.mqtt.interval,
settings.opentherm.inPin,
settings.opentherm.outPin,
settings.opentherm.memberIdCode,
settings.opentherm.dhwPresent,
settings.opentherm.summerWinterMode,
settings.opentherm.heatingCh2Enabled,
settings.opentherm.heatingCh1ToCh2,
settings.opentherm.dhwToCh2,
settings.opentherm.dhwBlocking,
settings.opentherm.modulationSyncWithHeating,
settings.sensors.outdoor.pin,
settings.sensors.indoor.pin
);
eeSettings.update(); eeSettings.update();
} }