modify task priority for ESP32, remove attach to core

This commit is contained in:
Yurii
2023-12-02 23:06:32 +03:00
parent c0a181632a
commit 88682eef13
6 changed files with 47 additions and 19 deletions

View File

@@ -25,8 +25,12 @@ protected:
return "Main"; return "Main";
} }
int getTaskCore() { /*int getTaskCore() {
return 1; return 1;
}*/
int getTaskPriority() {
return 3;
} }
void setup() { void setup() {

View File

@@ -26,8 +26,12 @@ protected:
return "Mqtt"; return "Mqtt";
} }
int getTaskCore() { /*int getTaskCore() {
return 0; return 1;
}*/
int getTaskPriority() {
return 1;
} }
void setup() { void setup() {

View File

@@ -32,8 +32,12 @@ protected:
return "OpenTherm"; return "OpenTherm";
} }
int getTaskCore() { /*int getTaskCore() {
return 1; return 1;
}*/
int getTaskPriority() {
return 2;
} }
void setup() { void setup() {
@@ -43,7 +47,7 @@ protected:
ot->setHandleSendRequestCallback(OpenThermTask::sendRequestCallback); ot->setHandleSendRequestCallback(OpenThermTask::sendRequestCallback);
ot->setYieldCallback([](void* self) { ot->setYieldCallback([](void* self) {
static_cast<OpenThermTask*>(self)->delay(10); static_cast<OpenThermTask*>(self)->delay(5);
}, this); }, this);
ot->begin(OpenThermTask::handleInterrupt, OpenThermTask::responseCallback); ot->begin(OpenThermTask::handleInterrupt, OpenThermTask::responseCallback);
@@ -92,7 +96,7 @@ protected:
Log.swarningln(FPSTR(S_OT), F("Set master config failed")); Log.swarningln(FPSTR(S_OT), F("Set master config failed"));
} }
yield(); //yield();
} }
bool heatingEnabled = (vars.states.emergency || settings.heating.enable) && pump && isReady(); bool heatingEnabled = (vars.states.emergency || settings.heating.enable) && pump && isReady();
@@ -155,7 +159,7 @@ protected:
Log.swarningln(FPSTR(S_OT_HEATING), F("Failed set max modulation %d%"), settings.heating.maxModulation); Log.swarningln(FPSTR(S_OT_HEATING), F("Failed set max modulation %d%"), settings.heating.maxModulation);
} }
} }
yield(); //yield();
// DHW min/max temp // DHW min/max temp
if (settings.opentherm.dhwPresent) { if (settings.opentherm.dhwPresent) {
@@ -182,7 +186,7 @@ protected:
eeSettings.update(); eeSettings.update();
} }
yield(); //yield();
} }
@@ -203,7 +207,7 @@ protected:
} else { } else {
Log.swarningln(FPSTR(S_OT_HEATING), F("Failed get min/max temp")); Log.swarningln(FPSTR(S_OT_HEATING), F("Failed get min/max temp"));
} }
yield(); //yield();
if (settings.heating.minTemp >= settings.heating.maxTemp) { if (settings.heating.minTemp >= settings.heating.maxTemp) {
settings.heating.minTemp = 20; settings.heating.minTemp = 20;
@@ -223,7 +227,7 @@ protected:
} }
prevUpdateNonEssentialVars = millis(); prevUpdateNonEssentialVars = millis();
yield(); //yield();
} }
updatePressure(); updatePressure();
@@ -233,12 +237,12 @@ protected:
} else { } else {
vars.sensors.modulation = 0; vars.sensors.modulation = 0;
} }
yield(); //yield();
if (settings.opentherm.dhwPresent) { if (settings.opentherm.dhwPresent) {
updateDhwTemp(); updateDhwTemp();
updateDhwFlowRate(); updateDhwFlowRate();
yield(); //yield();
} else { } else {
vars.temperatures.dhw = 0.0f; vars.temperatures.dhw = 0.0f;
@@ -246,7 +250,7 @@ protected:
} }
updateHeatingTemp(); updateHeatingTemp();
yield(); //yield();
// fault reset action // fault reset action
if (vars.actions.resetFault) { if (vars.actions.resetFault) {
@@ -260,7 +264,7 @@ protected:
} }
vars.actions.resetFault = false; vars.actions.resetFault = false;
yield(); //yield();
} }
// diag reset action // diag reset action
@@ -275,7 +279,7 @@ protected:
} }
vars.actions.resetDiagnostic = false; vars.actions.resetDiagnostic = false;
yield(); //yield();
} }
// //
@@ -303,7 +307,7 @@ protected:
} }
} }
yield(); //yield();
} }
// //
@@ -326,7 +330,7 @@ protected:
} }
} }
yield(); //yield();
} }
// коммутационная разность (hysteresis) // коммутационная разность (hysteresis)

View File

@@ -23,8 +23,12 @@ protected:
return "Regulator"; return "Regulator";
} }
int getTaskCore() { /*int getTaskCore() {
return 1; return 1;
}*/
int getTaskPriority() {
return 4;
} }
void loop() { void loop() {

View File

@@ -30,6 +30,14 @@ protected:
return "Sensors"; return "Sensors";
} }
/*int getTaskCore() {
return 1;
}*/
int getTaskPriority() {
return 4;
}
void loop() { void loop() {
if (settings.sensors.outdoor.type == 2) { if (settings.sensors.outdoor.type == 2) {
outdoorTemperatureSensor(); outdoorTemperatureSensor();

View File

@@ -45,7 +45,11 @@ protected:
return "WifiManager"; return "WifiManager";
} }
int getTaskCore() { /*int getTaskCore() {
return 1;
}*/
int getTaskPriority() {
return 0; return 0;
} }