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

Tidied up E-07 reporting, new AI app

Browse source
This commit is contained in:
rljonesau 2018-12-21 12:27:03 +11:00
parent 887c19c50a
commit 7bb0ffd022
4 changed files with 17 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
AppInventor/BluetoothHeaterMenu.aia
View file

Binary file not shown.

19
Arduino/BTCDieselHeater/src/Protocol/Protocol.cpp
View file

@ -336,7 +336,7 @@ const char* Runstates [] PROGMEM = {
const char*
CProtocolPackage::getRunStateStr() const
{
uint8_t runstate = Heater.getRunState();
uint8_t runstate = getRunState();
UPPERLIMIT(runstate, 10);
if(runstate == 2 && getPump_Actual() == 0) { // split runstate 2 - glow, then fuel
runstate = 9;
@ -371,7 +371,7 @@ const char* ErrstatesEx [] PROGMEM = {
"E-04: Pump fault", // E-04
"E-05: Overheat", // E-05
"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-09: Temp sense", // E-09
"E-10: Ignition fail", // E-10 SmartError manufactured state - sensing runstate 2 -> >5
@ -382,7 +382,7 @@ const char* ErrstatesEx [] PROGMEM = {
const char*
CProtocolPackage::getErrStateStr() const
{
uint8_t errstate = Heater.getErrState();
uint8_t errstate = getErrState();
UPPERLIMIT(errstate, 13);
return Errstates[errstate];
}
@ -390,7 +390,7 @@ CProtocolPackage::getErrStateStr() const
const char*
CProtocolPackage::getErrStateStrEx() const
{
uint8_t errstate = Heater.getErrState();
uint8_t errstate = getErrState();
UPPERLIMIT(errstate, 13);
return ErrstatesEx[errstate];
}
@ -412,4 +412,13 @@ CProtocolPackage::reportFrames(bool isOEM)
DebugReportFrame("BTC:", Controller, TERMINATE_BTC_LINE ? "\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();
}

2
Arduino/BTCDieselHeater/src/Protocol/Protocol.h
View file

@ -214,7 +214,7 @@ public:
void set(const CProtocol& htr, const CProtocol& ctl) { Heater = htr; Controller = ctl; };
int getRunState() const { return Heater.getRunState(); };
const char* getRunStateStr() const;
int getErrState() const { return Heater.getErrState(); };
int getErrState() const;
const char* getErrStateStr() const;
const char* getErrStateStrEx() const;
float getBattVoltage() const { return Heater.getVoltage_Supply(); };

10
Arduino/BTCDieselHeater/src/Utility/BTC_JSON.cpp
View file

@ -145,14 +145,8 @@ bool makeJsonString(CModerator& moderator, char* opStr, int len)
bSend |= moderator.addJson("TempBody", getHeaterInfo().getTemperature_HeatExchg(), root);
bSend |= moderator.addJson("RunState", getHeaterInfo().getRunState(), root);
bSend |= moderator.addJson("RunString", getHeaterInfo().getRunStateStr(), root); // verbose it up!
if(getBlueWireStat() & 0x01) {
bSend |= moderator.addJson("ErrorState", 8, root ); // force E-07
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("ErrorState", getHeaterInfo().getErrState(), root );
bSend |= moderator.addJson("ErrorString", getHeaterInfo().getErrStateStrEx(), root); // verbose it up!
bSend |= moderator.addJson("Thermostat", getHeaterInfo().isThermostat(), root );
bSend |= moderator.addJson("PumpFixed", getHeaterInfo().getPump_Fixed(), root );
bSend |= moderator.addJson("PumpMin", getHeaterInfo().getPump_Min(), root );