wn/NetMeterbusMaster
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

error count in watchdog message

Browse Source
This commit is contained in:
Wolfgang Hottgenroth 2017-01-04 17:57:52 +01:00
parent c9c6349290
commit 5f2b4bc7b9
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
MqttClient.cpp
View File

@ -199,7 +199,7 @@ Metro secondTick = Metro(1000);
MqttClient::MqttClient(RequestSender *meterBusMaster) : m_mqttConfig(this), MqttClient::MqttClient(RequestSender *meterBusMaster) : m_mqttConfig(this),
m_client(), m_meterBusMaster(meterBusMaster), m_mqttClient(m_client), m_client(), m_meterBusMaster(meterBusMaster), m_mqttClient(m_client),
m_disconnectState(3), m_disconnectTime(millis()), m_uptime(0), m_deviceIdx(0), m_disconnectState(3), m_disconnectTime(millis()), m_uptime(0), m_deviceIdx(0),
m_enabled(true) m_enabled(true), m_errorCount(0)
{ {
} }
@ -245,6 +245,7 @@ void MqttClient::sendResponse(uint8_t *responseBuffer, uint16_t responseBufferLe
void MqttClient::sendError(uint8_t code, uint16_t count, uint8_t token, char *name) { void MqttClient::sendError(uint8_t code, uint16_t count, uint8_t token, char *name) {
String msg = String("{ \"metadata\": { \"device\": \"MeterbusHub\", \"error\": ") String msg = String("{ \"metadata\": { \"device\": \"MeterbusHub\", \"error\": ")
+ code + String(", \"count\": ") + count + String(", \"token\": ") + token + String(", \"name\": ") + String(name) + String(" }, \"data\": { \"uptime\": ") + m_uptime + String("}}"); + code + String(", \"count\": ") + count + String(", \"token\": ") + token + String(", \"name\": ") + String(name) + String(" }, \"data\": { \"uptime\": ") + m_uptime + String("}}");
m_errorCount = count;
if (m_disconnectState == 0) { if (m_disconnectState == 0) {
//Serial << "publishing " << msg << endl; //Serial << "publishing " << msg << endl;
//Serial << "length: " << msg.length() << endl; //Serial << "length: " << msg.length() << endl;
@ -334,7 +335,7 @@ void MqttClient::exec() {
} }
byte wdogCnt = WDOG_RSTCNT; byte wdogCnt = WDOG_RSTCNT;
String msg = String("{ \"metadata\": { \"device\": \"MeterbusHub\" }, \"data\": { \"uptime\": ") + m_uptime + String(", \"watchdogCnt\": ") + wdogCnt + String("}}"); String msg = String("{ \"metadata\": { \"device\": \"MeterbusHub\" }, \"data\": { \"uptime\": ") + m_uptime + String(", \"errCnt\": ") + m_errorCount + String(", \"watchdogCnt\": ") + wdogCnt + String("}}");
if (m_disconnectState == 0) { if (m_disconnectState == 0) {
m_mqttClient.publish("IoT/Heartbeat/MeterbusHub", (char*)msg.c_str()); m_mqttClient.publish("IoT/Heartbeat/MeterbusHub", (char*)msg.c_str());
} else { } else {

1
MqttClient.h
View File

@ -58,6 +58,7 @@ private:
uint32_t m_uptime; uint32_t m_uptime;
uint8_t m_deviceIdx; uint8_t m_deviceIdx;
bool m_enabled; bool m_enabled;
uint16_t m_errorCount;
mbusDevTuple_t m_mbusDevTuple[NUM_OF_DEVICES]; mbusDevTuple_t m_mbusDevTuple[NUM_OF_DEVICES];
}; };