nils/ebusd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:john30/ebusd

Browse Source
This commit is contained in:
john30
2015-03-07 12:13:11 +01:00
parent 8511dad3dc 382f7e175d
commit 2dec01535b
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/ebus/data.cpp
+2 -2
View File
@@ -447,7 +447,7 @@ void SingleDataField::dump(ostream& output)
result_t SingleDataField::read(const PartType partType, result_t SingleDataField::read(const PartType partType,
SymbolString& data, unsigned char offset, SymbolString& data, unsigned char offset,
ostringstream& output, bool leadingSeparator, ostringstream& output, bool leadingSeparator,
bool verbose, const char* fieldName, char fieldIndex, bool verbose, const char* fieldName, signed char fieldIndex,
char separator) char separator)
{ {
if (partType != m_partType) if (partType != m_partType)
@@ -1255,7 +1255,7 @@ void DataFieldSet::dump(ostream& output)
result_t DataFieldSet::read(const PartType partType, result_t DataFieldSet::read(const PartType partType,
SymbolString& data, unsigned char offset, SymbolString& data, unsigned char offset,
ostringstream& output, bool leadingSeparator, ostringstream& output, bool leadingSeparator,
bool verbose, const char* fieldName, char fieldIndex, bool verbose, const char* fieldName, signed char fieldIndex,
char separator) char separator)
{ {
bool previousFullByteOffset = true, found = false, findFieldIndex = fieldName != NULL && fieldIndex >= 0; bool previousFullByteOffset = true, found = false, findFieldIndex = fieldName != NULL && fieldIndex >= 0;
src/lib/ebus/data.h
+3 -3
View File
@@ -229,7 +229,7 @@ public:
virtual result_t read(const PartType partType, virtual result_t read(const PartType partType,
SymbolString& data, unsigned char offset, SymbolString& data, unsigned char offset,
ostringstream& output, bool leadingSeparator=false, ostringstream& output, bool leadingSeparator=false,
bool verbose=false, const char* fieldName=NULL, char fieldIndex=-1, bool verbose=false, const char* fieldName=NULL, signed char fieldIndex=-1,
char separator=UI_FIELD_SEPARATOR) = 0; char separator=UI_FIELD_SEPARATOR) = 0;
/** /**
@@ -321,7 +321,7 @@ public:
virtual result_t read(const PartType partType, virtual result_t read(const PartType partType,
SymbolString& data, unsigned char offset, SymbolString& data, unsigned char offset,
ostringstream& output, bool leadingSeparator=false, ostringstream& output, bool leadingSeparator=false,
bool verbose=false, const char* fieldName=NULL, char fieldIndex=-1, bool verbose=false, const char* fieldName=NULL, signed char fieldIndex=-1,
char separator=UI_FIELD_SEPARATOR); char separator=UI_FIELD_SEPARATOR);
// @copydoc // @copydoc
@@ -653,7 +653,7 @@ public:
virtual result_t read(const PartType partType, virtual result_t read(const PartType partType,
SymbolString& data, unsigned char offset, SymbolString& data, unsigned char offset,
ostringstream& output, bool leadingSeparator=false, ostringstream& output, bool leadingSeparator=false,
bool verbose=false, const char* fieldName=NULL, char fieldIndex=-1, bool verbose=false, const char* fieldName=NULL, signed char fieldIndex=-1,
char separator=UI_FIELD_SEPARATOR); char separator=UI_FIELD_SEPARATOR);
// @copydoc // @copydoc
src/lib/ebus/message.cpp
+1 -1
View File
@@ -313,7 +313,7 @@ result_t Message::prepareSlave(SymbolString& slaveData)
result_t Message::decode(const PartType partType, SymbolString& data, result_t Message::decode(const PartType partType, SymbolString& data,
ostringstream& output, bool leadingSeparator, ostringstream& output, bool leadingSeparator,
bool verbose, const char* fieldName, char fieldIndex, bool verbose, const char* fieldName, signed char fieldIndex,
char separator) char separator)
{ {
unsigned char offset; unsigned char offset;
src/lib/ebus/message.h
+1 -1
View File
@@ -190,7 +190,7 @@ public:
*/ */
result_t decode(const PartType partType, SymbolString& data, result_t decode(const PartType partType, SymbolString& data,
ostringstream& output, bool leadingSeparator=false, ostringstream& output, bool leadingSeparator=false,
bool verbose=false, const char* fieldName=NULL, char fieldIndex=-1, bool verbose=false, const char* fieldName=NULL, signed char fieldIndex=-1,
char separator=UI_FIELD_SEPARATOR); char separator=UI_FIELD_SEPARATOR);
/** /**