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

formatting

Browse Source
This commit is contained in:
john30
2014-11-16 11:07:46 +01:00
parent 73534d2b45
commit 264ba1ca51
2 changed files with 155 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/ebus/data.cpp
+62 -40
View File
@@ -94,6 +94,7 @@ static const dataType_t dataTypes[] = {
{"B17", 7, bt_num, LST, 0, 0, 0x7f, 1, 1}, // seven bits 1-7 {"B17", 7, bt_num, LST, 0, 0, 0x7f, 1, 1}, // seven bits 1-7
}; };
/** the week day names. */ /** the week day names. */
static const char* dayNames[] = {"Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"}; static const char* dayNames[] = {"Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"};
@@ -101,9 +102,12 @@ static const char* dayNames[] = {"Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"
#define VALUE_SEPARATOR ',' #define VALUE_SEPARATOR ','
#define NULL_VALUE "-" #define NULL_VALUE "-"
result_t DataField::create(std::vector<std::string>::iterator& it, const std::vector<std::string>::iterator end, result_t DataField::create(std::vector<std::string>::iterator& it,
const std::map<std::string, DataField*> templates, std::vector<DataField*>& fields, const std::vector<std::string>::iterator end,
const bool isSetMessage, const unsigned char dstAddress) { const std::map<std::string, DataField*> templates,
std::vector<DataField*>& fields, const bool isSetMessage,
const unsigned char dstAddress)
{
std::string unit, comment; std::string unit, comment;
PartType partType; PartType partType;
unsigned int divisor = 0; unsigned int divisor = 0;
@@ -128,14 +132,17 @@ result_t DataField::create(std::vector<std::string>::iterator& it, const std::ve
partType = pt_masterData; partType = pt_masterData;
if (posStr[0] == 'm') if (posStr[0] == 'm')
posStr++; posStr++;
} else if ((isTemplate == false && isSetMessage == false && posStr[0] != 0 && posStr[0] <= '9') }
else if ((isTemplate == false && isSetMessage == false && posStr[0] != 0 && posStr[0] <= '9')
|| posStr[0] == 's') { // slave data || posStr[0] == 's') { // slave data
partType = pt_slaveData; partType = pt_slaveData;
if (posStr[0] == 's') if (posStr[0] == 's')
posStr++; posStr++;
} else if (isTemplate) { }
else if (isTemplate) {
partType = pt_template; partType = pt_template;
} else }
else
return RESULT_ERR_INVALID_ARG; return RESULT_ERR_INVALID_ARG;
bool hasPrev = fields.empty() == false; bool hasPrev = fields.empty() == false;
@@ -151,7 +158,8 @@ result_t DataField::create(std::vector<std::string>::iterator& it, const std::ve
if (posStr[0] == 0) { if (posStr[0] == 0) {
length = 0; length = 0;
} else { }
else {
offset = 0; offset = 0;
length = 0; length = 0;
std::istringstream stream(posStr); std::istringstream stream(posStr);
@@ -269,7 +277,8 @@ result_t DataField::create(std::vector<std::string>::iterator& it, const std::ve
else if (useLength != numBytes) else if (useLength != numBytes)
continue; // check for another one with same name but different length continue; // check for another one with same name but different length
switch (dataType.type) { switch (dataType.type)
{
case bt_str: case bt_str:
case bt_hexstr: case bt_hexstr:
case bt_dat: case bt_dat:
@@ -284,7 +293,8 @@ result_t DataField::create(std::vector<std::string>::iterator& it, const std::ve
if (values.empty() == true || (dataType.flags & LST) == 0) { if (values.empty() == true || (dataType.flags & LST) == 0) {
if (divisor == 0) { if (divisor == 0) {
divisor = dataType.divisor; divisor = dataType.divisor;
} else }
else
divisor *= dataType.divisor; divisor *= dataType.divisor;
fields.push_back(new NumberDataField(name, partType, offset, useLength, dataType, unit, comment, divisor)); fields.push_back(new NumberDataField(name, partType, offset, useLength, dataType, unit, comment, divisor));
return RESULT_OK; return RESULT_OK;
@@ -300,11 +310,13 @@ result_t DataField::create(std::vector<std::string>::iterator& it, const std::ve
return RESULT_ERR_INVALID_ARG; return RESULT_ERR_INVALID_ARG;
} }
result_t DataField::read(SymbolString& masterData, SymbolString& slaveData, std::ostringstream& output, bool verbose) result_t DataField::read(SymbolString& masterData, SymbolString& slaveData,
std::ostringstream& output, bool verbose)
{ {
SymbolString& input = m_partType == pt_masterData ? masterData : slaveData; SymbolString& input = m_partType == pt_masterData ? masterData : slaveData;
unsigned char baseOffset; unsigned char baseOffset;
switch (m_partType) { switch (m_partType)
{
case pt_masterData: case pt_masterData:
baseOffset = 5; // skip QQ ZZ PB SB NN baseOffset = 5; // skip QQ ZZ PB SB NN
break; break;
@@ -330,11 +342,13 @@ result_t DataField::read(SymbolString& masterData, SymbolString& slaveData, std:
return RESULT_OK; return RESULT_OK;
} }
result_t DataField::write(std::istringstream& input, SymbolString& masterData, SymbolString& slaveData) result_t DataField::write(std::istringstream& input, SymbolString& masterData,
SymbolString& slaveData)
{ {
SymbolString& output = m_partType == pt_masterData ? masterData : slaveData; SymbolString& output = m_partType == pt_masterData ? masterData : slaveData;
unsigned char baseOffset; unsigned char baseOffset;
switch (m_partType) { switch (m_partType)
{
case pt_masterData: case pt_masterData:
baseOffset = 5; // skip QQ ZZ PB SB NN baseOffset = 5; // skip QQ ZZ PB SB NN
break; break;
@@ -347,19 +361,21 @@ result_t DataField::write(std::istringstream& input, SymbolString& masterData, S
return writeSymbols(input, baseOffset, output); return writeSymbols(input, baseOffset, output);
} }
DataField* StringDataField::derive(std::string name, PartType partType,
unsigned char offset, std::string unit, std::string comment,
DataField* StringDataField::derive(std::string name, PartType partType, unsigned char offset, std::string unit, unsigned int divisor, std::map<unsigned int, std::string> values)
std::string comment, unsigned int divisor, std::map<unsigned int, std::string> values) { {
if (unit.empty() == true) if (unit.empty() == true)
unit = m_unit; unit = m_unit;
if (comment.empty() == true) if (comment.empty() == true)
comment = m_comment; comment = m_comment;
return new StringDataField(name, partType, offset, m_length, m_dataType, unit, comment); return new StringDataField(name, partType, offset, m_length, m_dataType,
unit, comment);
} }
result_t StringDataField::readSymbols(SymbolString& input, unsigned char baseOffset, std::ostringstream& output) result_t StringDataField::readSymbols(SymbolString& input,
unsigned char baseOffset, std::ostringstream& output)
{ {
size_t start = m_offset, end = m_offset + m_length; size_t start = m_offset, end = m_offset + m_length;
int incr = 1; int incr = 1;
@@ -383,7 +399,8 @@ result_t StringDataField::readSymbols(SymbolString& input, unsigned char baseOff
return RESULT_ERR_INVALID_ARG; // invalid BCD return RESULT_ERR_INVALID_ARG; // invalid BCD
ch = (ch >> 4) * 10 + (ch & 0x0f); ch = (ch >> 4) * 10 + (ch & 0x0f);
} }
switch (m_dataType.type) { switch (m_dataType.type)
{
case bt_hexstr: case bt_hexstr:
if (i > 0) if (i > 0)
output << ' '; output << ' ';
@@ -424,7 +441,8 @@ result_t StringDataField::readSymbols(SymbolString& input, unsigned char baseOff
return RESULT_OK; return RESULT_OK;
} }
result_t StringDataField::writeSymbols(std::istringstream& input, unsigned char baseOffset, SymbolString& output) result_t StringDataField::writeSymbols(std::istringstream& input,
unsigned char baseOffset, SymbolString& output)
{ {
size_t start = m_offset, end = m_offset + m_length; size_t start = m_offset, end = m_offset + m_length;
int incr = 1; int incr = 1;
@@ -441,7 +459,8 @@ result_t StringDataField::writeSymbols(std::istringstream& input, unsigned char
size_t i = 0; size_t i = 0;
for (size_t offset = start; offset != end; offset += incr, i++) { for (size_t offset = start; offset != end; offset += incr, i++) {
switch (m_dataType.type) { switch (m_dataType.type)
{
case bt_hexstr: case bt_hexstr:
while (input.peek() == ' ') while (input.peek() == ' ')
input.get(); input.get();
@@ -523,8 +542,8 @@ result_t StringDataField::writeSymbols(std::istringstream& input, unsigned char
return RESULT_OK; return RESULT_OK;
} }
result_t NumericDataField::readRawValue(SymbolString& input,
result_t NumericDataField::readRawValue(SymbolString& input, unsigned char baseOffset, unsigned int& value) unsigned char baseOffset, unsigned int& value)
{ {
size_t start = m_offset, end = m_offset + m_length; size_t start = m_offset, end = m_offset + m_length;
int incr = 1; int incr = 1;
@@ -568,7 +587,8 @@ result_t NumericDataField::readRawValue(SymbolString& input, unsigned char baseO
return RESULT_OK; return RESULT_OK;
} }
result_t NumericDataField::writeRawValue(unsigned int value, unsigned char baseOffset, SymbolString& output) result_t NumericDataField::writeRawValue(unsigned int value,
unsigned char baseOffset, SymbolString& output)
{ {
size_t start = m_offset, end = m_offset + m_length; size_t start = m_offset, end = m_offset + m_length;
int incr = 1; int incr = 1;
@@ -608,9 +628,10 @@ result_t NumericDataField::writeRawValue(unsigned int value, unsigned char baseO
return RESULT_OK; return RESULT_OK;
} }
DataField* NumberDataField::derive(std::string name, PartType partType,
DataField* NumberDataField::derive(std::string name, PartType partType, unsigned char offset, std::string unit, unsigned char offset, std::string unit, std::string comment,
std::string comment, unsigned int divisor, std::map<unsigned int, std::string> values) { unsigned int divisor, std::map<unsigned int, std::string> values)
{
if (unit.empty() == true) if (unit.empty() == true)
unit = m_unit; unit = m_unit;
if (comment.empty() == true) if (comment.empty() == true)
@@ -623,7 +644,8 @@ DataField* NumberDataField::derive(std::string name, PartType partType, unsigned
return new NumberDataField(name, partType, offset, m_length, m_dataType, unit, comment, divisor); return new NumberDataField(name, partType, offset, m_length, m_dataType, unit, comment, divisor);
} }
result_t NumberDataField::readSymbols(SymbolString& input, unsigned char baseOffset, std::ostringstream& output) result_t NumberDataField::readSymbols(SymbolString& input,
unsigned char baseOffset, std::ostringstream& output)
{ {
unsigned int value = 0; unsigned int value = 0;
int signedValue; int signedValue;
@@ -648,8 +670,7 @@ result_t NumberDataField::readSymbols(SymbolString& input, unsigned char baseOff
} }
signedValue = (int) value; // negative signed value signedValue = (int) value; // negative signed value
} }
else else if (negative) // negative signed value
if (negative) // negative signed value
signedValue = (int) value - (1 << m_dataType.numBits); signedValue = (int) value - (1 << m_dataType.numBits);
else else
signedValue = (int) value; signedValue = (int) value;
@@ -663,7 +684,8 @@ result_t NumberDataField::readSymbols(SymbolString& input, unsigned char baseOff
return RESULT_OK; return RESULT_OK;
} }
result_t NumberDataField::writeSymbols(std::istringstream& input, unsigned char baseOffset, SymbolString& output) result_t NumberDataField::writeSymbols(std::istringstream& input,
unsigned char baseOffset, SymbolString& output)
{ {
unsigned int value; unsigned int value;
@@ -722,13 +744,13 @@ result_t NumberDataField::writeSymbols(std::istringstream& input, unsigned char
return RESULT_ERR_INVALID_ARG; // value out of range return RESULT_ERR_INVALID_ARG; // value out of range
} }
return writeRawValue(value, baseOffset, output); return writeRawValue(value, baseOffset, output);
} }
DataField* ValueListDataField::derive(std::string name, PartType partType,
DataField* ValueListDataField::derive(std::string name, PartType partType, unsigned char offset, std::string unit, unsigned char offset, std::string unit, std::string comment,
std::string comment, unsigned int divisor, std::map<unsigned int, std::string> values) { unsigned int divisor, std::map<unsigned int, std::string> values)
{
if (unit.empty() == true) if (unit.empty() == true)
unit = m_unit; unit = m_unit;
if (comment.empty() == true) if (comment.empty() == true)
@@ -744,7 +766,8 @@ DataField* ValueListDataField::derive(std::string name, PartType partType, unsig
return new ValueListDataField(name, partType, offset, m_length, m_dataType, unit, comment, values); return new ValueListDataField(name, partType, offset, m_length, m_dataType, unit, comment, values);
} }
result_t ValueListDataField::readSymbols(SymbolString& input, unsigned char baseOffset, std::ostringstream& output) result_t ValueListDataField::readSymbols(SymbolString& input,
unsigned char baseOffset, std::ostringstream& output)
{ {
unsigned int value = 0; unsigned int value = 0;
@@ -766,7 +789,8 @@ result_t ValueListDataField::readSymbols(SymbolString& input, unsigned char base
return RESULT_ERR_INVALID_ARG; // value assignment not found return RESULT_ERR_INVALID_ARG; // value assignment not found
} }
result_t ValueListDataField::writeSymbols(std::istringstream& input, unsigned char baseOffset, SymbolString& output) result_t ValueListDataField::writeSymbols(std::istringstream& input,
unsigned char baseOffset, SymbolString& output)
{ {
const char* str = input.str().c_str(); const char* str = input.str().c_str();
@@ -780,6 +804,4 @@ result_t ValueListDataField::writeSymbols(std::istringstream& input, unsigned ch
return RESULT_ERR_INVALID_ARG; // value assignment not found return RESULT_ERR_INVALID_ARG; // value assignment not found
} }
} //namespace } //namespace
src/lib/ebus/test/test_data.cpp
+23 -11
View File
@@ -23,13 +23,18 @@
using namespace libebus; using namespace libebus;
void verify(bool expectFailMatch, std::string type, std::string input, bool match, std::string expectStr, std::string gotStr) { void verify(bool expectFailMatch, std::string type, std::string input,
bool match, std::string expectStr, std::string gotStr)
{
if (expectFailMatch == true) { if (expectFailMatch == true) {
if (match == true) if (match == true)
std::cout << " failed " << type << " match >" << input << "< error: unexpectedly succeeded" << std::endl; std::cout << " failed " << type << " match >" << input
<< "< error: unexpectedly succeeded" << std::endl;
else else
std::cout << " failed " << type << " match >" << input << "< OK" << std::endl; std::cout << " failed " << type << " match >" << input << "< OK"
} else if (match == true) << std::endl;
}
else if (match == true)
std::cout << " " << type << " >" << input << "< OK" << std::endl; std::cout << " " << type << " >" << input << "< OK" << std::endl;
else else
std::cout << " " << type << " >" << input << "< error: got >" << gotStr std::cout << " " << type << " >" << input << "< error: got >" << gotStr
@@ -199,7 +204,8 @@ int main ()
} while (result == RESULT_OK && it != entries.end()); } while (result == RESULT_OK && it != entries.end());
if (result != RESULT_OK) { if (result != RESULT_OK) {
std::cout << "\"" << check[0] << "\": create error: " << getResultCodeCStr(result) << std::endl; std::cout << "\"" << check[0] << "\": create error: "
<< getResultCodeCStr(result) << std::endl;
continue; continue;
} }
if (fields.empty() == true) { if (fields.empty() == true) {
@@ -237,11 +243,14 @@ int main ()
result = field->read(mstr, sstr, output, verbose); result = field->read(mstr, sstr, output, verbose);
if (failedRead == true) if (failedRead == true)
if (result == RESULT_OK) if (result == RESULT_OK)
std::cout << " failed read " << field->getName() << " >" << check[2] << "< error: unexpectedly succeeded" << std::endl; std::cout << " failed read " << field->getName() << " >"
<< check[2] << "< error: unexpectedly succeeded" << std::endl;
else else
std::cout << " failed read " << field->getName() << " >" << check[2] << "< OK" << std::endl; std::cout << " failed read " << field->getName() << " >"
<< check[2] << "< OK" << std::endl;
else if (result != RESULT_OK) { else if (result != RESULT_OK) {
std::cout << " read " << field->getName() << " >" << check[2] << "< error: " << getResultCodeCStr(result) << std::endl; std::cout << " read " << field->getName() << " >" << check[2] << "< error: "
<< getResultCodeCStr(result) << std::endl;
failed = true; failed = true;
} }
else if (combinedValue == false) { else if (combinedValue == false) {
@@ -257,12 +266,15 @@ int main ()
result = field->write(tokeninput, writeMstr, writeSstr); result = field->write(tokeninput, writeMstr, writeSstr);
if (failedWrite == true) { if (failedWrite == true) {
if (result == RESULT_OK) if (result == RESULT_OK)
std::cout << " failed write " << field->getName() << " >" << expectStr << "< error: unexpectedly succeeded" << std::endl; std::cout << " failed write " << field->getName() << " >"
<< expectStr << "< error: unexpectedly succeeded" << std::endl;
else else
std::cout << " failed write " << field->getName() << " >" << expectStr << "< OK" << std::endl; std::cout << " failed write " << field->getName() << " >"
<< expectStr << "< OK" << std::endl;
} }
else if (result != RESULT_OK) { else if (result != RESULT_OK) {
std::cout << " write " << field->getName() << " >" << expectStr << "< error: " << getResultCodeCStr(result) << std::endl; std::cout << " write " << field->getName() << " >"
<< expectStr << "< error: " << getResultCodeCStr(result) << std::endl;
failed = true; failed = true;
} }
} }