Merge branch 'async' into passive_ble

This commit is contained in:
Yurii
2025-11-02 11:45:06 +03:00
15 changed files with 571 additions and 688 deletions

View File

@@ -613,7 +613,12 @@ protected:
if (GPIO_IS_VALID(settings.externalPump.gpio)) {
configuredGpio = settings.externalPump.gpio;
pinMode(configuredGpio, OUTPUT);
digitalWrite(configuredGpio, LOW);
digitalWrite(
configuredGpio,
settings.externalPump.invertState
? HIGH
: LOW
);
} else if (configuredGpio != GPIO_IS_NOT_CONFIGURED) {
configuredGpio = GPIO_IS_NOT_CONFIGURED;
@@ -641,7 +646,12 @@ protected:
if (!settings.externalPump.use) {
if (vars.externalPump.state) {
digitalWrite(configuredGpio, LOW);
digitalWrite(
configuredGpio,
settings.externalPump.invertState
? HIGH
: LOW
);
vars.externalPump.state = false;
vars.externalPump.lastEnabledTime = millis();
@@ -654,7 +664,12 @@ protected:
if (vars.externalPump.state && !this->heatingEnabled) {
if (this->extPumpStartReason == MainTask::PumpStartReason::HEATING && millis() - this->heatingDisabledTime > (settings.externalPump.postCirculationTime * 1000u)) {
digitalWrite(configuredGpio, LOW);
digitalWrite(
configuredGpio,
settings.externalPump.invertState
? HIGH
: LOW
);
vars.externalPump.state = false;
vars.externalPump.lastEnabledTime = millis();
@@ -662,7 +677,12 @@ protected:
Log.sinfoln(FPSTR(L_EXTPUMP), F("Disabled: expired post circulation time"));
} else if (this->extPumpStartReason == MainTask::PumpStartReason::ANTISTUCK && millis() - this->externalPumpStartTime >= (settings.externalPump.antiStuckTime * 1000u)) {
digitalWrite(configuredGpio, LOW);
digitalWrite(
configuredGpio,
settings.externalPump.invertState
? HIGH
: LOW
);
vars.externalPump.state = false;
vars.externalPump.lastEnabledTime = millis();
@@ -678,7 +698,12 @@ protected:
this->externalPumpStartTime = millis();
this->extPumpStartReason = MainTask::PumpStartReason::HEATING;
digitalWrite(configuredGpio, HIGH);
digitalWrite(
configuredGpio,
settings.externalPump.invertState
? LOW
: HIGH
);
Log.sinfoln(FPSTR(L_EXTPUMP), F("Enabled: heating on"));
@@ -687,7 +712,12 @@ protected:
this->externalPumpStartTime = millis();
this->extPumpStartReason = MainTask::PumpStartReason::ANTISTUCK;
digitalWrite(configuredGpio, HIGH);
digitalWrite(
configuredGpio,
settings.externalPump.invertState
? LOW
: HIGH
);
Log.sinfoln(FPSTR(L_EXTPUMP), F("Enabled: anti stuck"));
}