Crash_Override/ESP32_ChinaDieselHeater_Control
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Bug fix of feedback over JSON of TempDesired when in Fixed Hz mode.

Browse source 
Introduced when demandDegC/demandPump split was added to fix Cyclic shutdown on low Hz demands.
This commit is contained in:
Ray Jones 2019-07-03 20:28:00 +10:00
parent 40c0a72c77
commit 6d7af0e010
3 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/Afterburner/Afterburner.cpp
View file

@ -769,7 +769,7 @@ void manageCyclicMode()
const sCyclicThermostat& cyclic = NVstore.getCyclicMode(); const sCyclicThermostat& cyclic = NVstore.getCyclicMode();
if(cyclic.Stop && bUserON) { // cyclic mode enabled, and user has started heater if(cyclic.Stop && bUserON) { // cyclic mode enabled, and user has started heater
int stopDeltaT = cyclic.Stop + 1; // bump up by 1 degree - no point invoking at 1 deg over! int stopDeltaT = cyclic.Stop + 1; // bump up by 1 degree - no point invoking at 1 deg over!
float deltaT = fFilteredTemperature - getTemperatureDesired(); float deltaT = fFilteredTemperature - getDemandDegC();
// DebugPort.printf("Cyclic=%d bUserOn=%d deltaT=%d\r\n", cyclic, bUserON, deltaT); // DebugPort.printf("Cyclic=%d bUserOn=%d deltaT=%d\r\n", cyclic, bUserON, deltaT);
// ensure we cancel user ON mode if heater throws an error // ensure we cancel user ON mode if heater throws an error
@ -966,7 +966,10 @@ float getTemperatureDesired()
return getHeaterInfo().getHeaterDemand(); return getHeaterInfo().getHeaterDemand();
} }
else { else {
return demandDegC; if(getThermostatModeActive())
return demandDegC;
else
return demandPump;
} }
} }

2
src/Afterburner/src/OLED/DetailedScreen.cpp
View file

@ -96,7 +96,7 @@ CDetailedScreen::show()
else { else {
fPump = getHeaterInfo().getPump_Fixed(); fPump = getHeaterInfo().getPump_Fixed();
if(NVstore.getUserSettings().cyclic.isEnabled()) if(NVstore.getUserSettings().cyclic.isEnabled())
desiredT = getTemperatureDesired(); desiredT = getDemandDegC();
} }
} }

2
src/Afterburner/src/Protocol/SmartError.cpp
View file

@ -41,7 +41,7 @@ void
CSmartError::inhibit() CSmartError::inhibit()
{ {
m_bInhibit = true; m_bInhibit = true;
m_Error = 0; // m_Error = 0;
} }
// accept a fresh heater frame // accept a fresh heater frame