Tidied up E-07 reporting, new AI app
This commit is contained in:
parent
887c19c50a
commit
7bb0ffd022
Binary file not shown.
|
@ -336,7 +336,7 @@ const char* Runstates [] PROGMEM = {
|
||||||
const char*
|
const char*
|
||||||
CProtocolPackage::getRunStateStr() const
|
CProtocolPackage::getRunStateStr() const
|
||||||
{
|
{
|
||||||
uint8_t runstate = Heater.getRunState();
|
uint8_t runstate = getRunState();
|
||||||
UPPERLIMIT(runstate, 10);
|
UPPERLIMIT(runstate, 10);
|
||||||
if(runstate == 2 && getPump_Actual() == 0) { // split runstate 2 - glow, then fuel
|
if(runstate == 2 && getPump_Actual() == 0) { // split runstate 2 - glow, then fuel
|
||||||
runstate = 9;
|
runstate = 9;
|
||||||
|
@ -371,7 +371,7 @@ const char* ErrstatesEx [] PROGMEM = {
|
||||||
"E-04: Pump fault", // E-04
|
"E-04: Pump fault", // E-04
|
||||||
"E-05: Overheat", // E-05
|
"E-05: Overheat", // E-05
|
||||||
"E-06: Motor fault", // E-06
|
"E-06: Motor fault", // E-06
|
||||||
"E-07: Comms fault", // E-07
|
"E-07: No heater comms", // E-07
|
||||||
"E-08: Flame out", // E-08
|
"E-08: Flame out", // E-08
|
||||||
"E-09: Temp sense", // E-09
|
"E-09: Temp sense", // E-09
|
||||||
"E-10: Ignition fail", // E-10 SmartError manufactured state - sensing runstate 2 -> >5
|
"E-10: Ignition fail", // E-10 SmartError manufactured state - sensing runstate 2 -> >5
|
||||||
|
@ -382,7 +382,7 @@ const char* ErrstatesEx [] PROGMEM = {
|
||||||
const char*
|
const char*
|
||||||
CProtocolPackage::getErrStateStr() const
|
CProtocolPackage::getErrStateStr() const
|
||||||
{
|
{
|
||||||
uint8_t errstate = Heater.getErrState();
|
uint8_t errstate = getErrState();
|
||||||
UPPERLIMIT(errstate, 13);
|
UPPERLIMIT(errstate, 13);
|
||||||
return Errstates[errstate];
|
return Errstates[errstate];
|
||||||
}
|
}
|
||||||
|
@ -390,7 +390,7 @@ CProtocolPackage::getErrStateStr() const
|
||||||
const char*
|
const char*
|
||||||
CProtocolPackage::getErrStateStrEx() const
|
CProtocolPackage::getErrStateStrEx() const
|
||||||
{
|
{
|
||||||
uint8_t errstate = Heater.getErrState();
|
uint8_t errstate = getErrState();
|
||||||
UPPERLIMIT(errstate, 13);
|
UPPERLIMIT(errstate, 13);
|
||||||
return ErrstatesEx[errstate];
|
return ErrstatesEx[errstate];
|
||||||
}
|
}
|
||||||
|
@ -412,4 +412,13 @@ CProtocolPackage::reportFrames(bool isOEM)
|
||||||
DebugReportFrame("BTC:", Controller, TERMINATE_BTC_LINE ? "\r\n" : " ");
|
DebugReportFrame("BTC:", Controller, TERMINATE_BTC_LINE ? "\r\n" : " ");
|
||||||
}
|
}
|
||||||
DebugReportFrame("HTR:", Heater, "\r\n");
|
DebugReportFrame("HTR:", Heater, "\r\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int
|
||||||
|
CProtocolPackage::getErrState() const
|
||||||
|
{
|
||||||
|
if(getBlueWireStat() & 0x01)
|
||||||
|
return 8; // force E-07 - we're not seeing heater data
|
||||||
|
else
|
||||||
|
return Heater.getErrState();
|
||||||
|
}
|
||||||
|
|
|
@ -214,7 +214,7 @@ public:
|
||||||
void set(const CProtocol& htr, const CProtocol& ctl) { Heater = htr; Controller = ctl; };
|
void set(const CProtocol& htr, const CProtocol& ctl) { Heater = htr; Controller = ctl; };
|
||||||
int getRunState() const { return Heater.getRunState(); };
|
int getRunState() const { return Heater.getRunState(); };
|
||||||
const char* getRunStateStr() const;
|
const char* getRunStateStr() const;
|
||||||
int getErrState() const { return Heater.getErrState(); };
|
int getErrState() const;
|
||||||
const char* getErrStateStr() const;
|
const char* getErrStateStr() const;
|
||||||
const char* getErrStateStrEx() const;
|
const char* getErrStateStrEx() const;
|
||||||
float getBattVoltage() const { return Heater.getVoltage_Supply(); };
|
float getBattVoltage() const { return Heater.getVoltage_Supply(); };
|
||||||
|
|
|
@ -145,14 +145,8 @@ bool makeJsonString(CModerator& moderator, char* opStr, int len)
|
||||||
bSend |= moderator.addJson("TempBody", getHeaterInfo().getTemperature_HeatExchg(), root);
|
bSend |= moderator.addJson("TempBody", getHeaterInfo().getTemperature_HeatExchg(), root);
|
||||||
bSend |= moderator.addJson("RunState", getHeaterInfo().getRunState(), root);
|
bSend |= moderator.addJson("RunState", getHeaterInfo().getRunState(), root);
|
||||||
bSend |= moderator.addJson("RunString", getHeaterInfo().getRunStateStr(), root); // verbose it up!
|
bSend |= moderator.addJson("RunString", getHeaterInfo().getRunStateStr(), root); // verbose it up!
|
||||||
if(getBlueWireStat() & 0x01) {
|
bSend |= moderator.addJson("ErrorState", getHeaterInfo().getErrState(), root );
|
||||||
bSend |= moderator.addJson("ErrorState", 8, root ); // force E-07
|
bSend |= moderator.addJson("ErrorString", getHeaterInfo().getErrStateStrEx(), root); // verbose it up!
|
||||||
bSend |= moderator.addJson("ErrorString", "E-07: No heater data", root);
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
bSend |= moderator.addJson("ErrorState", getHeaterInfo().getErrState(), root );
|
|
||||||
bSend |= moderator.addJson("ErrorString", getHeaterInfo().getErrStateStrEx(), root); // verbose it up!
|
|
||||||
}
|
|
||||||
bSend |= moderator.addJson("Thermostat", getHeaterInfo().isThermostat(), root );
|
bSend |= moderator.addJson("Thermostat", getHeaterInfo().isThermostat(), root );
|
||||||
bSend |= moderator.addJson("PumpFixed", getHeaterInfo().getPump_Fixed(), root );
|
bSend |= moderator.addJson("PumpFixed", getHeaterInfo().getPump_Fixed(), root );
|
||||||
bSend |= moderator.addJson("PumpMin", getHeaterInfo().getPump_Min(), root );
|
bSend |= moderator.addJson("PumpMin", getHeaterInfo().getPump_Min(), root );
|
||||||
|
|
Loading…
Reference in a new issue