From 58a1a01d42e51b96bcd8a75d5aa02900206be846 Mon Sep 17 00:00:00 2001 From: Wolfgang Hottgenroth Date: Wed, 4 Jan 2017 17:25:54 +0100 Subject: [PATCH] consider count in sendError --- MqttClient.cpp | 2 +- meterBusMaster.cpp | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/MqttClient.cpp b/MqttClient.cpp index 37c5175..87985cf 100644 --- a/MqttClient.cpp +++ b/MqttClient.cpp @@ -244,7 +244,7 @@ void MqttClient::sendResponse(uint8_t *responseBuffer, uint16_t responseBufferLe void MqttClient::sendError(uint8_t code, uint16_t count, uint8_t token, char *name) { String msg = String("{ \"metadata\": { \"device\": \"MeterbusHub\", \"error\": ") - + code + 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("}}"); if (m_disconnectState == 0) { //Serial << "publishing " << msg << endl; //Serial << "length: " << msg.length() << endl; diff --git a/meterBusMaster.cpp b/meterBusMaster.cpp index c7dbaf2..f98612c 100644 --- a/meterBusMaster.cpp +++ b/meterBusMaster.cpp @@ -123,9 +123,14 @@ void SendOctets::sendResponse(uint8_t *responseBuffer, uint16_t responseBufferLe } void SendOctets::sendError(uint8_t code, uint16_t count, uint8_t token, char *name) { + Print *out = m_server; switch (code) { case 1: - m_server->println("SO RESP: no resp."); + out->println("SO RESP: no resp."); + out->print("Code: "); + out->println(code); + out->print("Count: "); + out->println(count); break; } }