From a9a986558399e7b87acee44743c04eebdc4edcb0 Mon Sep 17 00:00:00 2001
From: john30 <ebusd@johnm.de>
Date: Sun, 14 Dec 2014 11:36:14 +0100
Subject: [PATCH] added verbose arg to decode()

---
 src/lib/ebus/message.cpp | 4 ++--
 src/lib/ebus/message.h   | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/lib/ebus/message.cpp b/src/lib/ebus/message.cpp
index 01d421e9..8d229e2a 100644
--- a/src/lib/ebus/message.cpp
+++ b/src/lib/ebus/message.cpp
@@ -293,7 +293,7 @@ result_t Message::prepareSlave(SymbolString& slaveData)
 }
 
 result_t Message::decode(const PartType partType, SymbolString& data,
-		ostringstream& output, bool leadingSeparator, char separator)
+		ostringstream& output, bool leadingSeparator, bool verbose, char separator)
 {
 	unsigned char offset;
 	if (partType == pt_masterData)
@@ -301,7 +301,7 @@ result_t Message::decode(const PartType partType, SymbolString& data,
 	else
 		offset = 0;
 	int startPos = output.str().length();
-	result_t result = m_data->read(partType, data, offset, output, leadingSeparator, false, separator);
+	result_t result = m_data->read(partType, data, offset, output, leadingSeparator, verbose, separator);
 	time(&m_lastUpdateTime);
 	if (result != RESULT_OK) {
 		m_lastValue.clear();
diff --git a/src/lib/ebus/message.h b/src/lib/ebus/message.h
index 27430019..a3da24db 100644
--- a/src/lib/ebus/message.h
+++ b/src/lib/ebus/message.h
@@ -165,11 +165,13 @@ public:
 	 * @param data the unescaped data @a SymbolString for reading binary data.
 	 * @param output the @a ostringstream to append the formatted value to.
 	 * @param leadingSeparator whether to prepend a separator before the formatted value.
+	 * @param verbose whether to prepend the name, append the unit (if present), and append
+	 * the comment in square brackets (if present).
 	 * @param separator the separator character between multiple fields.
 	 * @return @a RESULT_OK on success, or an error code.
 	 */
 	result_t decode(const PartType partType, SymbolString& data,
-			ostringstream& output, bool leadingSeparator=false, char separator=UI_FIELD_SEPARATOR);
+			ostringstream& output, bool leadingSeparator=false, bool verbose=false, char separator=UI_FIELD_SEPARATOR);
 
 	/**
 	 * @brief Get the last decoded value.