diff --git a/ChangeLog.md b/ChangeLog.md index a0a9ad7b5..cf59f2172 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,3 +1,13 @@ +# 21.3 (tbd) + +## Bug Fixes +* fix for escaping double quote in CSV format +* adjusted helper shell scripts and Munin plugin to newer netcat + +## Features +* added DTM data type + + # 21.2 (2021-02-08) ## Bug Fixes diff --git a/src/lib/ebus/datatype.cpp b/src/lib/ebus/datatype.cpp index 98b5a8ad8..ca4fec09f 100755 --- a/src/lib/ebus/datatype.cpp +++ b/src/lib/ebus/datatype.cpp @@ -214,6 +214,7 @@ result_t DateTimeDataType::readSymbols(size_t offset, size_t length, const Symbo size_t start = 0, count = length; int incr = 1; symbol_t symbol, last = 0, hour = 0; + unsigned long minutes = 0; if (count == REMAIN_LEN && input.getDataSize() > offset) { count = input.getDataSize() - offset; } else if (offset + count > input.getDataSize()) { @@ -229,7 +230,7 @@ result_t DateTimeDataType::readSymbols(size_t offset, size_t length, const Symbo } int type = (m_hasDate?2:0) | (m_hasTime?1:0); for (size_t index = start, i = 0; i < count; index += incr, i++) { - if (length == 4 && i == 2 && m_hasDate) { + if (length == 4 && i == 2 && m_hasDate && !m_hasTime) { continue; // skip weekday in between } symbol = input.dataAt(offset + index); @@ -279,58 +280,85 @@ result_t DateTimeDataType::readSymbols(size_t offset, size_t length, const Symbo } break; - case 1: // time only - if (!hasFlag(REQ) && symbol == m_replacement) { - if (length == 1) { // truncated time - *output << NULL_VALUE << ":" << NULL_VALUE; + case 1: // time only + if (!hasFlag(REQ) && symbol == m_replacement) { + if (length == 1) { // truncated time + *output << NULL_VALUE << ":" << NULL_VALUE; + break; + } + if (i > 0) { + *output << ":"; + } + *output << NULL_VALUE; break; } - if (i > 0) { - *output << ":"; + if (hasFlag(SPE)) { // minutes since midnight + if (i == 0) { + last = symbol; + continue; + } + unsigned int minutes = symbol*256 + last; + if (minutes > 24*60) { + return RESULT_ERR_OUT_OF_RANGE; // invalid value + } + unsigned int minutesHour = minutes / 60; + if (minutesHour > 24) { + return RESULT_ERR_OUT_OF_RANGE; // invalid hour + } + *output << setw(2) << dec << setfill('0') << minutesHour; + symbol = (symbol_t)(minutes % 60); + } else if (length == 1) { // truncated time + if (m_bitCount < 8) { + symbol = (symbol_t)(symbol & ((1 << m_bitCount) - 1)); + } + if (i == 0) { + symbol = (symbol_t)(symbol/(60/m_resolution)); // convert to hours + index -= incr; // repeat for minutes + count++; + } else { + symbol = (symbol_t)((symbol % (60/m_resolution)) * m_resolution); // convert to minutes + } } - *output << NULL_VALUE; - break; - } - if (hasFlag(SPE)) { // minutes since midnight if (i == 0) { - last = symbol; - continue; - } - unsigned int minutes = symbol*256 + last; - if (minutes > 24*60) { - return RESULT_ERR_OUT_OF_RANGE; // invalid value + if (symbol > 24) { + return RESULT_ERR_OUT_OF_RANGE; // invalid hour + } + hour = symbol; + } else if (symbol > 59 || (hour == 24 && symbol > 0)) { + return RESULT_ERR_OUT_OF_RANGE; // invalid time } - unsigned int minutesHour = minutes / 60; - if (minutesHour > 24) { - return RESULT_ERR_OUT_OF_RANGE; // invalid hour + if (i > 0) { + *output << ":"; } - *output << setw(2) << dec << setfill('0') << minutesHour; - symbol = (symbol_t)(minutes % 60); - } else if (length == 1) { // truncated time - if (m_bitCount < 8) { - symbol = (symbol_t)(symbol & ((1 << m_bitCount) - 1)); + *output << setw(2) << dec << setfill('0') << static_cast(symbol); + break; + + case 3: // date+time + if (length != 4) { + return RESULT_ERR_INVALID_POS; } - if (i == 0) { - symbol = (symbol_t)(symbol/(60/m_resolution)); // convert to hours - index -= incr; // repeat for minutes - count++; - } else { - symbol = (symbol_t)((symbol % (60/m_resolution)) * m_resolution); // convert to minutes + // number of minutes since 01.01.2009 + minutes |= symbol*(1<<(8*i)); + if (i<3) { + break; } - } - if (i == 0) { - if (symbol > 24) { - return RESULT_ERR_OUT_OF_RANGE; // invalid hour + int mjd = static_cast(minutes/(24*60)) + 54832; // 01.01.2009 + int y = static_cast((mjd-15078.2)/365.25); + int m = static_cast((mjd-14956.1-static_cast(y*365.25))/30.6001); + int d = mjd-14956-static_cast(y*365.25)-static_cast(m*30.6001); + m--; + if (m >= 13) { + y++; + m -= 12; } - hour = symbol; - } else if (symbol > 59 || (hour == 24 && symbol > 0)) { - return RESULT_ERR_OUT_OF_RANGE; // invalid time - } - if (i > 0) { - *output << ":"; - } - *output << setw(2) << dec << setfill('0') << static_cast(symbol); - break; + *output << dec << setfill('0') << setw(2) << static_cast(d) << "." + << setw(2) << static_cast(m) << "." << static_cast(y + 1900); + m = minutes%(24*60); + d = m/60; + *output << " " << setw(2) << dec << setfill('0') << static_cast(d); + m -= d*60; + *output << ":" << setw(2) << dec << setfill('0') << static_cast(m); + break; } last = symbol; } @@ -366,113 +394,141 @@ result_t DateTimeDataType::writeSymbols(size_t offset, size_t length, istringstr } result_t result; size_t i = 0, index; - int type = (m_hasDate?2:0) | (m_hasTime?1:0); + int type = m_hasDate ? 2 : (m_hasTime ? 1 : 0); bool skip = false; for (index = start; i < count; index += skip ? 0 : incr, i++) { skip = false; switch (type) { - case 2: // date only - if (length == 4 && i == 2) { - continue; // skip weekday in between - } - if (input->eof() || !getline(*input, token, '.')) { - return RESULT_ERR_EOF; // incomplete - } - if (!hasFlag(REQ) && token == NULL_VALUE) { - value = m_replacement; - break; - } - value = parseInt(token.c_str(), 10, 0, 2099, &result); - if (result != RESULT_OK) { - return result; // invalid date part - } - if (length == 2) { // number of days since 01.01.1900 - skip = true; - if (i == 0) { - count++; - } else if (i + 1 == count) { - int y = (value < 100 ? value + 2000 : value) - 1900; - int l = last <= 2 ? 1 : 0; - int mjd = 14956 + lastLast + static_cast((y-l)*365.25) + static_cast((last+1+l*12)*30.6001); - value = mjd - 15020; // 01.01.1900 - output->dataAt(offset + index) = (symbol_t)(value&0xff); - value >>= 8; - index += incr; - skip = false; - break; + case 2: // date only + if (length == 4 && i == 2 && !m_hasTime) { + continue; // skip weekday in between } - } - if (i + 1 == count) { - if (length == 4) { - // calculate local week day - int y = (value < 100 ? value + 2000 : value) - 1900; - int l = last <= 2 ? 1 : 0; - int mjd = 14956 + lastLast + static_cast((y-l)*365.25) + static_cast((last+1+l*12)*30.6001); - int daysSinceSunday = (mjd+3) % 7; // Sun=0 - if (hasFlag(BCD)) { - output->dataAt(offset + index - incr) = (symbol_t)((6+daysSinceSunday) % 7); // Sun=0x06 - } else { - // Sun=0x07 - output->dataAt(offset + index - incr) = (symbol_t)(daysSinceSunday == 0 ? 7 : daysSinceSunday); - } + if (input->eof() || !getline(*input, token, m_hasTime && i==2 ? ' ' : '.')) { + return RESULT_ERR_EOF; // incomplete } - if (value >= 2000) { - value -= 2000; + if (!hasFlag(REQ) && token == NULL_VALUE) { + value = m_replacement; + break; } - if (value > 99) { - return RESULT_ERR_OUT_OF_RANGE; // invalid year + value = parseInt(token.c_str(), 10, 0, 2099, &result); + if (result != RESULT_OK) { + return result; // invalid date part } - } else if (value < 1 || (i == 0 && value > 31) || (i == 1 && value > 12)) { - return RESULT_ERR_OUT_OF_RANGE; // invalid date part - } - break; - - case 1: // time only - if (input->eof() || !getline(*input, token, LENGTH_SEPARATOR)) { - return RESULT_ERR_EOF; // incomplete - } - if (!hasFlag(REQ) && token == NULL_VALUE) { - value = m_replacement; - if (length == 1) { // truncated time + if (length == 2) { // number of days since 01.01.1900 + skip = true; if (i == 0) { - skip = true; // repeat for minutes count++; + } else if (i + 1 == count) { + int y = (value < 100 ? value + 2000 : value) - 1900; + int l = last <= 2 ? 1 : 0; + int mjd = 14956 + lastLast + static_cast((y-l)*365.25) + static_cast((last+1+l*12)*30.6001); + value = mjd - 15020; // 01.01.1900 + output->dataAt(offset + index) = (symbol_t)(value&0xff); + value >>= 8; + index += incr; + skip = false; break; } - if (last != m_replacement) { - return RESULT_ERR_INVALID_NUM; // invalid truncated time minutes + } + if (i + 1 == (m_hasTime ? count-1 : count)) { + if (length == 4) { + int y = (value < 100 ? value + 2000 : value) - 1900; + int l = last <= 2 ? 1 : 0; + int mjd = 14956 + lastLast + static_cast((y-l)*365.25) + static_cast((last+1+l*12)*30.6001); + if (m_hasTime) { + if (mjd < 54832) { // 01.01.2009 + return RESULT_ERR_OUT_OF_RANGE; // invalid date + } + last = mjd - 54832; + index = start + incr; + i = 1; + type = 1; + skip = true; // switch to second pass for parsing the time + } else { + // calculate local week day + int daysSinceSunday = (mjd + 3) % 7; // Sun=0 + if (hasFlag(BCD)) { + output->dataAt(offset + index - incr) = (symbol_t) ((6 + daysSinceSunday) % 7); // Sun=0x06 + } else { + // Sun=0x07 + output->dataAt(offset + index - incr) = (symbol_t) (daysSinceSunday == 0 ? 7 : daysSinceSunday); + } + } + } + if (value >= 2000) { + value -= 2000; } + if (value > 99) { + return RESULT_ERR_OUT_OF_RANGE; // invalid year + } + } else if (value < 1 || (i == 0 && value > 31) || (i == 1 && value > 12)) { + return RESULT_ERR_OUT_OF_RANGE; // invalid date part } break; - } - value = parseInt(token.c_str(), 10, 0, 59, &result); - if (result != RESULT_OK) { - return result; // invalid time part - } - if ((i == 0 && value > 24) || (i > 0 && (last == 24 && value > 0) )) { - return RESULT_ERR_OUT_OF_RANGE; // invalid time part - } - if (hasFlag(SPE)) { // minutes since midnight - if (i == 0) { - skip = true; // repeat for minutes - break; + + case 1: // time only + if (input->eof() || !getline(*input, token, LENGTH_SEPARATOR)) { + return RESULT_ERR_EOF; // incomplete } - value += last*60; - output->dataAt(offset + index) = (symbol_t)(value&0xff); - value >>= 8; - index += incr; - } else if (length == 1) { // truncated time - if (i == 0) { - skip = true; // repeat for minutes - count++; + if (!hasFlag(REQ) && token == NULL_VALUE) { + value = m_replacement; + if (length == 1) { // truncated time + if (i == 0) { + skip = true; // repeat for minutes + count++; + break; + } + if (last != m_replacement) { + return RESULT_ERR_INVALID_NUM; // invalid truncated time minutes + } + } break; } - value = (last * 60 + value + m_resolution/2)/m_resolution; - if (value > 24 * 6) { - return RESULT_ERR_OUT_OF_RANGE; // invalid time + value = parseInt(token.c_str(), 10, 0, 59, &result); + if (result != RESULT_OK) { + return result; // invalid time part } - } - break; + if ((i == 0 && value > 24) || (i > 0 && (last == 24 && value > 0) )) { + return RESULT_ERR_OUT_OF_RANGE; // invalid time part + } + if (hasFlag(SPE)) { // minutes since midnight + if (i == 0) { + skip = true; // repeat for minutes + break; + } + value += last*60; + output->dataAt(offset + index) = (symbol_t)(value&0xff); + value >>= 8; + index += incr; + } else if (length == 1) { // truncated time + if (i == 0) { + skip = true; // repeat for minutes + count++; + break; + } + value = (last * 60 + value + m_resolution/2)/m_resolution; + if (value > 24 * 6) { + return RESULT_ERR_OUT_OF_RANGE; // invalid time + } + } else if (m_hasDate) { + if (i + 1 == count) { + last = (lastLast * 24 + last) * 60 + value; + value = last & 0xff; + last >>= 8; + index = start; + i = 0; + type = 3; + } else { + last = lastLast; + skip = true; + } + } + break; + + case 3: // date and time in store phase + value = lastLast & 0xff; + last = lastLast >> 8; + break; } lastLast = last; last = value; @@ -940,6 +996,8 @@ DataTypeList::DataTypeList() { add(new DateTimeDataType("HDA", 24, 0, 0xff, true, false, 0)); // date, days since 01.01.1900, 01.01.1900 - 06.06.2079 (0x00,0x00 - 0xff,0xff) add(new DateTimeDataType("DAY", 16, 0, 0xff, true, false, 0)); + // date+time in minutes since 01.01.2009, 01.01.2009 - 31.12.2099 + add(new DateTimeDataType("DTM", 32, REQ, 0x100, true, true, 0)); // time in BCD, 00:00:00 - 23:59:59 (0x00,0x00,0x00 - 0x59,0x59,0x23) add(new DateTimeDataType("BTI", 24, BCD|REV, 0xff, false, true, 0)); // time, 00:00:00 - 23:59:59 (0x00,0x00,0x00 - 0x17,0x3b,0x3b) diff --git a/src/lib/ebus/test/test_data.cpp b/src/lib/ebus/test/test_data.cpp index 8e80c2dca..5a3c7a719 100755 --- a/src/lib/ebus/test/test_data.cpp +++ b/src/lib/ebus/test/test_data.cpp @@ -29,13 +29,13 @@ using std::endl; static bool error = false; void verify(bool expectFailMatch, string type, string input, - bool match, string expectStr, string gotStr) { + bool match, string expectStr, string gotStr) { match = match && expectStr == gotStr; if (expectFailMatch) { if (match) { error = true; cout << " failed " << type << " match >" << input - << "< error: unexpectedly succeeded" << endl; + << "< error: unexpectedly succeeded" << endl; } else { cout << " failed " << type << " match >" << input << "< OK" << endl; } @@ -44,15 +44,15 @@ void verify(bool expectFailMatch, string type, string input, } else { error = true; cout << " " << type << " match >" << input << "< error: got >" - << gotStr << "<, expected >" << expectStr << "<" << endl; + << gotStr << "<, expected >" << expectStr << "<" << endl; } } class TestReader : public MappedFileReader { public: TestReader(DataFieldTemplates* templates, bool isSet, bool isMasterDest) - : MappedFileReader::MappedFileReader(true), m_templates(templates), m_isSet(isSet), m_isMasterDest(isMasterDest), - m_fields(nullptr) {} + : MappedFileReader::MappedFileReader(true), m_templates(templates), m_isSet(isSet), m_isMasterDest(isMasterDest), + m_fields(nullptr) {} result_t getFieldMap(const string& preferLanguage, vector* row, string* errorDescription) const override { if (row->empty()) { row->push_back("*name"); @@ -69,11 +69,11 @@ class TestReader : public MappedFileReader { return RESULT_OK; // leave it to DataField::create } result_t addFromFile(const string& filename, unsigned int lineNo, map* row, - vector< map >* subRows, string* errorDescription, bool replace) override { + vector< map >* subRows, string* errorDescription, bool replace) override { if (!row->empty() || subRows->empty()) { cout << "read line " << static_cast(lineNo) << ": read error: got " - << static_cast(row->size()) << "/0 main, " << static_cast(subRows->size()) - << "/>=3 sub" << endl; + << static_cast(row->size()) << "/0 main, " << static_cast(subRows->size()) + << "/>=3 sub" << endl; return RESULT_ERR_EOF; } cout << "read line " << static_cast(lineNo) << ": read OK" << endl; @@ -93,433 +93,436 @@ int main() { // definition: name,part,type[:len][,[divisor|values][,[unit][,[comment]]]] unsigned int baseLine = __LINE__+1; string checks[][5] = { - {"x,,ign:10", "", "10fe07000a00000000000000000000", "00", ""}, - {"x,,ign:*", "", "10fe07000a00000000000000000000", "00", "W"}, - {"x,,ign,2", "", "", "", "c"}, - {"x,,str:10", "Hallo, Du!", "10fe07000a48616c6c6f2c20447521", "00", ""}, - {"x,,str:10", "Hallo, Du!", "10fe07000a48616c6c6f2c20447521", "00", ""}, - {"x,,str:10", "Hallo, Du ", "10fe07000a48616c6c6f2c20447520", "00", ""}, - {"x,,str:10", " ", "10fe07000a20202020202020202020", "00", ""}, - {"x,,str:10", "", "10fe07000a20202020202020202020", "00", "R"}, - {"x,,str:11", "", "10fe07000a20202020202020202020", "00", "rW"}, - {"x,,str:24", "abcdefghijklmnopqrstuvwx", "10fe0700186162636465666768696a6b6c6d6e6f707172737475767778", "00", ""}, - {"x,,str:*", "abcde", "10fe0700056162636465", "00", ""}, - {"x,,str,2", "", "", "", "c"}, - {"x,,str:10,=dummy", "", "10fe07000a48616c6c6f2044752120", "00", "W"}, - {"x,,str:10,==dummy", "", "10fe07000a48616c6c6f2044752120", "00", "rW"}, - {"x,,str:10,=dummy", "", "10fe07000a64756d6d792020202020", "00", ""}, - {"x,,str:10,==dummy", "", "10fe07000a64756d6d792020202020", "00", ""}, - {"x,,nts:10", "Hallo, Du!", "10fe07000a48616c6c6f2c20447521", "00", ""}, - {"x,,nts:10", "Hallo, Du!", "10fe07000a48616c6c6f2c20447521", "00", ""}, - {"x,,nts:10", "Hallo, Du", "10fe07000a48616c6c6f2c20447500", "00", ""}, - {"x,,nts:10", " ", "10fe07000a20202020202020202020", "00", ""}, - {"x,,nts:10", "", "10fe07000a00000000000000000000", "00", ""}, - {"x,,nts:10", "abc", "10fe07000a6162630065666768696a", "00", "W"}, - {"x,,nts:11", "", "10fe07000a20202020202020202020", "00", "rW"}, - {"x,,nts:24", "abcdefghijklmnopqrstuvwx", "10fe0700186162636465666768696a6b6c6d6e6f707172737475767778", "00", ""}, - {"x,,nts:*", "abcde", "10fe0700056162636465", "00", "W"}, - {"x,,nts:*", "abcde", "10fe070006616263646500", "00", ""}, - {"x,,nts,2", "", "", "", "c"}, - {"x,,hex", "20", "10fe07000120", "00", ""}, - {"x,,hex:10", "48 61 6c 6c 6f 2c 20 44 75 21", "10fe07000a48616c6c6f2c20447521", "00", ""}, - {"x,,hex:*", "48 61 6c 6c 6f", "10fe07000548616c6c6f", "00", ""}, - {"x,,hex:11", "", "10fe07000a48616c6c6f2c20447521", "00", "rW"}, - {"x,,hex,2", "", "", "", "c"}, - {"x,,hex:5,=48 61 6c 6c 6f", "", "10fe070005ababababab", "00", "W"}, - {"x,,hex:5,==48 61 6c 6c 6f", "", "10fe070005ababababab", "00", "rW"}, - {"x,,hex:5,=48 61 6c 6c 6f", "", "10fe07000548616c6c6f", "00", ""}, - {"x,,hex:5,==48 61 6c 6c 6f", "", "10fe07000548616c6c6f", "00", ""}, - {"x,,bda", "26.10.2014", "10fe07000426100614", "00", ""}, // Sunday - {"x,,bda", "01.01.2000", "10fe07000401010500", "00", ""}, // Saturday - {"x,,bda", "31.12.2099", "10fe07000431120399", "00", ""}, // Thursday - {"x,,bda", "-.-.-", "10fe070004ffff00ff", "00", ""}, - {"x,,bda", "", "10fe07000432100014", "00", "rw"}, - {"x,,bda:3", "26.10.2014", "10fe070003261014", "00", ""}, - {"x,,bda:3", "01.01.2000", "10fe070003010100", "00", ""}, - {"x,,bda:3", "31.12.2099", "10fe070003311299", "00", ""}, - {"x,,bda:3", "-.-.-", "10fe070003ffffff", "00", ""}, - {"x,,bda:3", "", "10fe070003321299", "00", "rw"}, - {"x,,bda,2", "", "", "", "c"}, - {"x,,hda", "26.10.2014", "10fe0700041a0a070e", "00", ""}, // Sunday - {"x,,hda", "01.01.2000", "10fe07000401010600", "00", ""}, // Saturday - {"x,,hda", "31.12.2099", "10fe0700041f0c0463", "00", ""}, // Thursday - {"x,,hda", "-.-.-", "10fe070004ffff00ff", "00", ""}, - {"x,,hda", "", "10fe070004200c0463", "00", "rw"}, - {"x,,hda:3", "26.10.2014", "10fe0700031a0a0e", "00", ""}, - {"x,,hda:3", "01.01.2000", "10fe070003010100", "00", ""}, - {"x,,hda:3", "31.12.2099", "10fe0700031f0c63", "00", ""}, - {"x,,hda:3", "-.-.-", "10fe070003ffffff", "00", ""}, - {"x,,hda:3", "", "10fe070003200c63", "00", "rw"}, - {"x,,hda,2", "", "", "", "c"}, - {"x,,day", "26.10.2014", "10fe070002d0a3", "00", ""}, - {"x,,day", "01.01.2000", "10fe070002ac8e", "00", ""}, - {"x,,day", "31.12.2078", "10fe07000262ff", "00", ""}, - {"x,,day", "-.-.-", "10fe070002ffff", "00", ""}, - {"x,,day", "", "10fe0700020000", "00", "Rw"}, - {"x,,bti", "21:04:58", "10fe070003580421", "00", ""}, - {"x,,bti", "00:00:00", "10fe070003000000", "00", ""}, - {"x,,bti", "23:59:59", "10fe070003595923", "00", ""}, - {"x,,bti", "-:-:-", "10fe070003ffffff", "00", ""}, - {"x,,bti", "", "10fe070003605923", "00", "rw"}, - {"x,,bti,2", "", "", "", "c"}, - {"x,,hti", "21:04:58", "10fe07000315043a", "00", ""}, - {"x,,hti", "-:-:-", "10fe070003ffffff", "00", ""}, - {"x,,hti,2", "", "", "", "c"}, - {"x,,vti", "21:04:58", "10fe0700033a0415", "00", ""}, - {"x,,vti", "-:-:-", "10fe070003636363", "00", ""}, - {"x,,vti,2", "", "", "", "c"}, - {"x,,btm", "21:04", "10fe0700020421", "00", ""}, - {"x,,btm", "00:00", "10fe0700020000", "00", ""}, - {"x,,btm", "23:59", "10fe0700025923", "00", ""}, - {"x,,btm", "24:00", "10fe0700020024", "00", ""}, - {"x,,btm", "-:-", "10fe070002ffff", "00", ""}, - {"x,,btm", "", "10fe0700025924", "00", "rw"}, - {"x,,btm", "24:01", "10fe0700020124", "00", "rw"}, - {"x,,btm,2", "", "", "", "c"}, - {"x,,htm", "21:04", "10fe0700021504", "00", ""}, - {"x,,htm", "00:00", "10fe0700020000", "00", ""}, - {"x,,htm", "23:59", "10fe070002173b", "00", ""}, - {"x,,htm", "24:00", "10fe0700021800", "00", ""}, - {"x,,htm", "-:-", "10fe070002ffff", "00", ""}, - {"x,,htm", "", "10fe070002183b", "00", "rw"}, - {"x,,htm", "24:01", "10fe0700021801", "00", "rw"}, - {"x,,htm,2", "", "", "", "c"}, - {"x,,vtm", "21:04", "10fe0700020415", "00", ""}, - {"x,,vtm", "00:00", "10fe0700020000", "00", ""}, - {"x,,vtm", "23:59", "10fe0700023b17", "00", ""}, - {"x,,vtm", "24:00", "10fe0700020018", "00", ""}, - {"x,,vtm", "-:-", "10fe070002ffff", "00", ""}, - {"x,,vtm", "", "10fe0700023b18", "00", "rw"}, - {"x,,vtm", "24:01", "10fe0700020118", "00", "rw"}, - {"x,,vtm,2", "", "", "", "c"}, - {"x,,min", "21:04", "10fe070002f004", "00", ""}, - {"x,,min", "00:00", "10fe0700020000", "00", ""}, - {"x,,min", "23:59", "10fe0700029f05", "00", ""}, - {"x,,min", "24:00", "10fe070002a005", "00", ""}, - {"x,,min", "-:-", "10fe070002ffff", "00", ""}, - {"x,,min", "", "10fe070002bbbb", "00", "rw"}, - {"x,,min", "24:01", "10fe070002a105", "00", "rw"}, - {"x,,min,2", "", "", "", "c"}, - {"x,,ttm", "22:40", "10fe07000188", "00", ""}, - {"x,,ttm", "00:00", "10fe07000100", "00", ""}, - {"x,,ttm", "23:50", "10fe0700018f", "00", ""}, - {"x,,ttm", "23:54", "10fe0700018f", "00", "R"}, - {"x,,ttm", "23:55", "10fe07000190", "00", "R"}, - {"x,,ttm", "23:56", "10fe07000190", "00", "R"}, - {"x,,ttm", "23:59", "10fe07000190", "00", "R"}, - {"x,,ttm", "-:-", "10fe07000190", "00", ""}, - {"x,,ttm", "", "10fe07000191", "00", "rw"}, - {"x,,ttm,2", "", "", "", "c"}, - {"x,,tth", "22:30", "10fe0700012d", "00", ""}, - {"x,,tth", "00:30", "10fe07000101", "00", ""}, - {"x,,tth", "23:31", "10fe0700012f", "00", "R"}, - {"x,,tth", "23:44", "10fe0700012f", "00", "R"}, - {"x,,tth", "23:45", "10fe07000130", "00", "R"}, - {"x,,tth", "24:00", "10fe07000130", "00", ""}, - {"x,,tth", "-:-", "10fe07000100", "00", ""}, - {"x,,tth", "", "10fe07000131", "00", "rw"}, - {"x,,tth,2", "", "", "", "c"}, - {"x,,tth,,,,y,,bi6:2", "23:30;0", "10fe0700012f", "00", ""}, // bit combination - {"x,,tth,,,,y,,bi6:2", "23:30;2", "10fe070001af", "00", ""}, // bit combination - {"x,,ttq", "22:30", "10fe0700015a", "00", ""}, - {"x,,ttq", "00:30", "10fe07000102", "00", ""}, - {"x,,ttq", "23:31", "10fe0700015e", "00", "R"}, - {"x,,ttq", "23:44", "10fe0700015f", "00", "R"}, - {"x,,ttq", "23:45", "10fe0700015f", "00", ""}, - {"x,,ttq", "24:00", "10fe07000160", "00", ""}, - {"x,,ttq", "-:-", "10fe07000100", "00", ""}, - {"x,,ttq,,,,,,ttq", "23:00;05:45", "10fe0700025c17", "00", ""}, - {"x,,ttq,,,,,,bi7,,,,,,ttq", "23:00;0;05:45", "10fe0700025c17", "00", ""}, - {"x,,ttq,,,,,,bi7,,,,,,ttq", "23:00;1;05:45", "10fe070002dc17", "00", ""}, - {"x,,ttq", "", "10fe07000161", "00", "rw"}, - {"x,,ttq,2", "", "", "", "c"}, - {"x,,ttq,,,,y,,bi7", "23:45;0", "10fe0700015f", "00", ""}, // bit combination - {"x,,ttq,,,,y,,bi7", "23:45;1", "10fe070001df", "00", ""}, // bit combination - {"x,,bdy", "Mon", "10fe07000100", "00", ""}, - {"x,,bdy", "Sun", "10fe07000106", "00", ""}, - {"x,,bdy", "8", "10fe07000108", "00", "w"}, - {"x,,hdy", "Mon", "10fe07000101", "00", ""}, - {"x,,hdy", "Sun", "10fe07000107", "00", ""}, - {"x,,hdy", "8", "10fe07000108", "00", "w"}, - {"x,,pin", "1234", "10feffff021234", "00", ""}, - {"x,,pin", "0000", "10feffff020000", "00", ""}, - {"x,,pin", "9999", "10feffff029999", "00", ""}, - {"x,,pin", "", "10feffff020000", "00", "Rw"}, - {"x,,pin", "100", "10feffff020100", "00", "R"}, - {"x,,bcd", "26", "10feffff0126", "00", ""}, - {"x,,bcd", "0", "10feffff0100", "00", ""}, - {"x,,bcd", "99", "10feffff0199", "00", ""}, - {"x,,bcd", "100", "10feffff0199", "00", "Rw"}, - {"x,,bcd", "-", "10feffff01ff", "00", ""}, - {"x,,bcd", "", "10feffff019a", "00", "rw"}, - {"x,,bcd:1", "26", "10feffff0126", "00", ""}, - {"x,,bcd:1", "0", "10feffff0100", "00", ""}, - {"x,,bcd:1", "99", "10feffff0199", "00", ""}, - {"x,,bcd:1", "100", "10feffff0199", "00", "Rw"}, - {"x,,bcd:1", "-", "10feffff01ff", "00", ""}, - {"x,,bcd:1", "", "10feffff019a", "00", "rw"}, - {"x,,bcd:2", "126", "10feffff022601", "00", ""}, - {"x,,bcd:2", "0", "10feffff020000", "00", ""}, - {"x,,bcd:2", "9999", "10feffff029999", "00", ""}, - {"x,,bcd:2", "10000", "10feffff029999", "00", "Rw"}, - {"x,,bcd:2", "-", "10feffff02ffff", "00", ""}, - {"x,,bcd:2", "", "10feffff029a00", "00", "rw"}, - {"x,,bcd:3", "12346", "10feffff03462301", "00", ""}, - {"x,,bcd:3", "0", "10feffff03000000", "00", ""}, - {"x,,bcd:3", "999999", "10feffff03999999", "00", ""}, - {"x,,bcd:3", "1000000", "10feffff03999999", "00", "Rw"}, - {"x,,bcd:3", "-", "10feffff03ffffff", "00", ""}, - {"x,,bcd:3", "", "10feffff03009a00", "00", "rw"}, - {"x,,bcd:4", "1234567", "10feffff0467452301", "00", ""}, - {"x,,bcd:4", "0", "10feffff0400000000", "00", ""}, - {"x,,bcd:4", "99999999", "10feffff0499999999", "00", ""}, - {"x,,bcd:4", "100000000", "10feffff0499999999", "00", "Rw"}, - {"x,,bcd:4", "-", "10feffff04ffffffff", "00", ""}, - {"x,,bcd:4", "", "10feffff0400009a00", "00", "rw"}, - {"x,,hcd:1", "26", "10feffff011a", "00", ""}, - {"x,,hcd:1", "0", "10feffff0100", "00", ""}, - {"x,,hcd:1", "99", "10feffff0163", "00", ""}, - {"x,,hcd:1", "100", "10feffff0163", "00", "Rw"}, - {"x,,hcd:1", "", "10feffff019a", "00", "rw"}, - {"x,,hcd:2", "126", "10feffff021a01", "00", ""}, - {"x,,hcd:2", "0", "10feffff020000", "00", ""}, - {"x,,hcd:2", "9999", "10feffff026363", "00", ""}, - {"x,,hcd:2", "10000", "10feffff026363", "00", "Rw"}, - {"x,,hcd:2", "", "10feffff029a00", "00", "rw"}, - {"x,,hcd:3", "12346", "10feffff032e1701", "00", ""}, - {"x,,hcd:3", "0", "10feffff03000000", "00", ""}, - {"x,,hcd:3", "999999", "10feffff03636363", "00", ""}, - {"x,,hcd:3", "1000000", "10feffff03636363", "00", "Rw"}, - {"x,,hcd:3", "", "10feffff03009a00", "00", "rw"}, - {"x,,hcd:4", "1234567", "10feffff04432d1701", "00", ""}, - {"x,,hcd:4", "0", "10feffff0400000000", "00", ""}, - {"x,,hcd:4", "99999999", "10feffff0463636363", "00", ""}, - {"x,,hcd:4", "100000000", "10feffff0463636363", "00", "Rw"}, - {"x,,hcd", "", "10feffff0400006400", "00", "rw"}, - {"x,,hcd", "1234567", "10feffff04432d1701", "00", ""}, - {"x,,hcd", "0", "10feffff0400000000", "00", ""}, - {"x,,hcd", "99999999", "10feffff0463636363", "00", ""}, - {"x,,hcd", "100000000", "10feffff0463636363", "00", "Rw"}, - {"x,,hcd", "", "10feffff0400006400", "00", "rw"}, - {"x,,str:16", "0123456789ABCDEF", "10feffff1030313233343536373839414243444546", "00", ""}, - {"x,,uch:17", "", "10feffff00", "00", "c"}, - {"x,s,uch", "0", "1025ffff0310111213", "0300010203", "W"}, - {"x,s,uch", "0", "1025ffff00", "0100", ""}, - {"x,s,uch,,,,y,m,uch", "3;2", "1025ffff0103", "0102", ""}, - {"x,,uch", "38", "10feffff0126", "00", ""}, - {"x,,uch", "38.5", "10feffff0126", "00", "R"}, - {"x,,uch", "0", "10feffff0100", "00", ""}, - {"x,,uch", "254", "10feffff01fe", "00", ""}, - {"x,,uch", "-", "10feffff01ff", "00", ""}, - {"x,,uch,10", "3.8", "10feffff0126", "00", ""}, - {"x,,uch,-10", "380", "10feffff0126", "00", ""}, - {"x,,uch,=48", "", "10feffff01ab", "00", "W"}, - {"x,,uch,==48", "", "10feffff01ab", "00", "rW"}, - {"x,,uch,=48", "", "10feffff0130", "00", ""}, - {"x,,uch,==48", "", "10feffff0130", "00", ""}, - {"x,,sch", "-90", "10feffff01a6", "00", ""}, - {"x,,sch", "0", "10feffff0100", "00", ""}, - {"x,,sch", "-1", "10feffff01ff", "00", ""}, - {"x,,sch", "-", "10feffff0180", "00", ""}, - {"x,,sch", "-127", "10feffff0181", "00", ""}, - {"x,,sch", "127", "10feffff017f", "00", ""}, - {"x,,sch,10", "-9.0", "10feffff01a6", "00", ""}, - {"x,,sch,-10", "-900", "10feffff01a6", "00", ""}, - {"x,,d1b", "-90", "10feffff01a6", "00", ""}, - {"x,,d1b", "0", "10feffff0100", "00", ""}, - {"x,,d1b", "-1", "10feffff01ff", "00", ""}, - {"x,,d1b", "-", "10feffff0180", "00", ""}, - {"x,,d1b", "-127", "10feffff0181", "00", ""}, - {"x,,d1b", "127", "10feffff017f", "00", ""}, - {"x,,d1b,-10", "-900", "10feffff01a6", "00", ""}, - {"x,,d1c", "19.5", "10feffff0127", "00", ""}, - {"x,,d1c", "0.0", "10feffff0100", "00", ""}, - {"x,,d1c", "100.0", "10feffff01c8", "00", ""}, - {"x,,d1c", "-", "10feffff01ff", "00", ""}, - {"x,,uin", "38", "10feffff022600", "00", ""}, - {"x,,uin", "0", "10feffff020000", "00", ""}, - {"x,,uin", "65534", "10feffff02feff", "00", ""}, - {"x,,uin", "-", "10feffff02ffff", "00", ""}, - {"x,,uin,10", "3.8", "10feffff022600", "00", ""}, - {"x,,uin,-10", "380", "10feffff022600", "00", ""}, - {"x,,uir", "38", "10feffff020026", "00", ""}, - {"x,,uir", "0", "10feffff020000", "00", ""}, - {"x,,uir", "65534", "10feffff02fffe", "00", ""}, - {"x,,uir", "-", "10feffff02ffff", "00", ""}, - {"x,,uir,10", "3.8", "10feffff020026", "00", ""}, - {"x,,uir,-10", "380", "10feffff020026", "00", ""}, - {"uin10,uin,-10", "", "", "", "t"}, // template - {"x,,uin10", "380", "10feffff022600", "00", ""}, // template reference - {"x,,uin10,-10", "3800", "10feffff022600", "00", ""}, // template reference, valid divisor product - {"x,,uin10,10", "", "", "", "c"}, // template reference, invalid divisor product - {"x,,sin", "-90", "10feffff02a6ff", "00", ""}, - {"x,,sin", "0", "10feffff020000", "00", ""}, - {"x,,sin", "-1", "10feffff02ffff", "00", ""}, - {"x,,sin", "-", "10feffff020080", "00", ""}, - {"x,,sin", "-32767", "10feffff020180", "00", ""}, - {"x,,sin", "32767", "10feffff02ff7f", "00", ""}, - {"x,,sin,10", "-9.0", "10feffff02a6ff", "00", ""}, - {"x,,sin,-10", "-900", "10feffff02a6ff", "00", ""}, - {"x,,sir", "-90", "10feffff02ffa6", "00", ""}, - {"x,,sir", "0", "10feffff020000", "00", ""}, - {"x,,sir", "-1", "10feffff02ffff", "00", ""}, - {"x,,sir", "-", "10feffff028000", "00", ""}, - {"x,,sir", "-32767", "10feffff028001", "00", ""}, - {"x,,sir", "32767", "10feffff027fff", "00", ""}, - {"x,,sir,10", "-9.0", "10feffff02ffa6", "00", ""}, - {"x,,sir,-10", "-900", "10feffff02ffa6", "00", ""}, - {"x,,u3n", "38", "10feffff03260000", "00", ""}, - {"x,,u3n", "0", "10feffff03000000", "00", ""}, - {"x,,u3n", "16777214", "10feffff03feffff", "00", ""}, - {"x,,u3n", "-", "10feffff03ffffff", "00", ""}, - {"x,,u3n,10", "3.8", "10feffff03260000", "00", ""}, - {"x,,u3n,-10", "380", "10feffff03260000", "00", ""}, - {"x,,u3r", "38", "10feffff03000026", "00", ""}, - {"x,,u3r", "0", "10feffff03000000", "00", ""}, - {"x,,u3r", "16777214", "10feffff03fffffe", "00", ""}, - {"x,,u3r", "-", "10feffff03ffffff", "00", ""}, - {"x,,u3r,10", "3.8", "10feffff03000026", "00", ""}, - {"x,,u3r,-10", "380", "10feffff03000026", "00", ""}, - {"x,,s3n", "-90", "10feffff03a6ffff", "00", ""}, - {"x,,s3n", "0", "10feffff03000000", "00", ""}, - {"x,,s3n", "-1", "10feffff03ffffff", "00", ""}, - {"x,,s3n", "-", "10feffff03000080", "00", ""}, - {"x,,s3n", "-8388607", "10feffff03010080", "00", ""}, - {"x,,s3n", "8388607", "10feffff03ffff7f", "00", ""}, - {"x,,s3n,10", "-9.0", "10feffff03a6ffff", "00", ""}, - {"x,,s3n,-10", "-900", "10feffff03a6ffff", "00", ""}, - {"x,,s3r", "-90", "10feffff03ffffa6", "00", ""}, - {"x,,s3r", "0", "10feffff03000000", "00", ""}, - {"x,,s3r", "-1", "10feffff03ffffff", "00", ""}, - {"x,,s3r", "-", "10feffff03800000", "00", ""}, - {"x,,s3r", "-8388607", "10feffff03800001", "00", ""}, - {"x,,s3r", "8388607", "10feffff037fffff", "00", ""}, - {"x,,s3r,10", "-9.0", "10feffff03ffffa6", "00", ""}, - {"x,,s3r,-10", "-900", "10feffff03ffffa6", "00", ""}, - {"x,,flt", "-0.090", "10feffff02a6ff", "00", ""}, - {"x,,flt", "0.000", "10feffff020000", "00", ""}, - {"x,,flt", "-0.001", "10feffff02ffff", "00", ""}, - {"x,,flt", "-", "10feffff020080", "00", ""}, - {"x,,flt", "-32.767", "10feffff020180", "00", ""}, - {"x,,flt", "32.767", "10feffff02ff7f", "00", ""}, - {"x,,flr", "-0.090", "10feffff02ffa6", "00", ""}, - {"x,,flr", "0.000", "10feffff020000", "00", ""}, - {"x,,flr", "-0.001", "10feffff02ffff", "00", ""}, - {"x,,flr", "-", "10feffff028000", "00", ""}, - {"x,,flr", "-32.767", "10feffff028001", "00", ""}, - {"x,,flr", "32.767", "10feffff027fff", "00", ""}, - {"x,,exp", "-0.09", "10feffff04ec51b8bd", "00", ""}, - {"x,,exp", "0.0", "10feffff0400000000", "00", ""}, - {"x,,exp", "-0.001", "10feffff046f1283ba", "00", ""}, - {"x,,exp", "-", "10feffff040000807f", "00", ""}, - {"x,,exp", "-32.767", "10feffff04681103c2", "00", ""}, - {"x,,exp,1000", "-0.000090000", "10feffff04ec51b8bd", "00", ""}, - {"x,,exp,-100", "-9", "10feffff04ec51b8bd", "00", ""}, - {"x,,exp", "0.25", "10feffff040000803e", "00", ""}, - {"x,,exp", "-", "10feffff040000c07f", "00", "W"}, - {"x,,exr", "-0.09", "10feffff04bdb851ec", "00", ""}, - {"x,,exr", "0.0", "10feffff0400000000", "00", ""}, - {"x,,exr", "-0.001", "10feffff04ba83126f", "00", ""}, - {"x,,exr", "-", "10feffff047f800000", "00", ""}, - {"x,,exr", "-32.767", "10feffff04c2031168", "00", ""}, - {"x,,exr,1000", "-0.000090000", "10feffff04bdb851ec", "00", ""}, - {"x,,exr,-100", "-9", "10feffff04bdb851ec", "00", ""}, - {"x,,d2b", "18.004", "10fe0700020112", "00", ""}, - {"x,,d2b", "0.000", "10feffff020000", "00", ""}, - {"x,,d2b", "-0.004", "10feffff02ffff", "00", ""}, - {"x,,d2b", "-", "10feffff020080", "00", ""}, - {"x,,d2b", "-127.996", "10feffff020180", "00", ""}, - {"x,,d2b", "127.996", "10feffff02ff7f", "00", ""}, - {"x,,d2c", "288.06", "10fe0700020112", "00", ""}, - {"x,,d2c", "0.00", "10feffff020000", "00", ""}, - {"x,,d2c", "-0.06", "10feffff02ffff", "00", ""}, - {"x,,d2c", "-", "10feffff020080", "00", ""}, - {"x,,d2c", "-2047.94", "10feffff020180", "00", ""}, - {"x,,d2c", "2047.94", "10feffff02ff7f", "00", ""}, - {"x,,ulg", "38", "10feffff0426000000", "00", ""}, - {"x,,ulg", "0", "10feffff0400000000", "00", ""}, - {"x,,ulg", "4294967294", "10feffff04feffffff", "00", ""}, - {"x,,ulg", "-", "10feffff04ffffffff", "00", ""}, - {"x,,ulg,10", "3.8", "10feffff0426000000", "00", ""}, - {"x,,ulg,-10", "380", "10feffff0426000000", "00", ""}, - {"x,,ulg,0x0FF0F00F = VRT 350 ;0x33CCCC33=VRT 360;0x3CC3C33C=SD 17;0x66999966=SD 37;0x69969669=VRT 360+", "VRT 350", "10feffff040FF0F00F", "00", ""}, - {"x,,ulg,0x=test", "", "10feffff040FF0F00F", "00", "c"}, - {"x,,ulr", "38", "10feffff0400000026", "00", ""}, - {"x,,ulr", "0", "10feffff0400000000", "00", ""}, - {"x,,ulr", "4294967294", "10feffff04fffffffe", "00", ""}, - {"x,,ulr", "-", "10feffff04ffffffff", "00", ""}, - {"x,,ulr,10", "3.8", "10feffff0400000026", "00", ""}, - {"x,,ulr,-10", "380", "10feffff0400000026", "00", ""}, - {"x,,slg", "-90", "10feffff04a6ffffff", "00", ""}, - {"x,,slg", "0", "10feffff0400000000", "00", ""}, - {"x,,slg", "-1", "10feffff04ffffffff", "00", ""}, - {"x,,slg,10", "-9.0", "10feffff04a6ffffff", "00", ""}, - {"x,,slg,-10", "-900", "10feffff04a6ffffff", "00", ""}, - {"x,,slr", "-90", "10feffff04ffffffa6", "00", ""}, - {"x,,slr", "0", "10feffff0400000000", "00", ""}, - {"x,,slr", "-1", "10feffff04ffffffff", "00", ""}, - {"x,,slr,10", "-9.0", "10feffff04ffffffa6", "00", ""}, - {"x,,slr,-10", "-900", "10feffff04ffffffa6", "00", ""}, - {"x,,bi3", "1", "10feffff0108", "00", ""}, - {"x,,bi3", "0", "10feffff0100", "00", ""}, - {"x,,bi3,0=off;1=on", "on", "10feffff0108", "00", ""}, - {"x,,bi3,0=off;1=on", "off", "10feffff0100", "00", ""}, - {"x,,bi3:2", "1", "10feffff0108", "00", ""}, - {"x,,bi3:2", "1", "10feffff01ef", "00", "W"}, - {"x,,bi3:2", "0", "10feffff0100", "00", ""}, - {"x,,bi3:2", "3", "10feffff0118", "00", ""}, - {"x,,bi3:2,1=on", "on", "10feffff0108", "00", ""}, - {"x,,bi3:2,1=on", "-", "10feffff0100", "00", ""}, - {"x,,bi3:2,0=off;1=on;2=auto;3=eco", "auto", "10feffff0110", "00", ""}, - {"x,,bi3:2,0=off;1=on;2=auto;3=eco", "2.5", "10feffff0110", "00", "R"}, - {"x,,bi3:2,0=off;1=on", "on", "10feffff0108", "00", ""}, - {"x,,bi3:2,0=off;1=on", "off", "10feffff0100", "00", ""}, - {"x,,bi3:2,0=off;1=on", "1", "10feffff0108", "00", "n"}, - {"x,,bi3:2,0=off;1=on,ja/nein,Wahrheitswert", "x=on ja/nein [Wahrheitswert]", "10feffff0108", "00", "vvv"}, - {"x,,bi3:2,0=off;1=on,ja/nein,Wahrheitswert", "x=1 ja/nein [Wahrheitswert]", "10feffff0108", "00", "vvvn"}, - {"x,,bi3:2,0=off;1=on,ja/nein,Wahrheitswert", "\n \"x\": {\"value\": \"on\"}", "10feffff0108", "00", "vj"}, - {",,bi3:2,0=off;1=on,ja/nein,Wahrheitswert", "\n \"0\": {\"name\": \"\", \"value\": \"on\"}", "10feffff0108", "00", "vj"}, - {",,bi3:2,0=off;1=on,ja/nein,Wahrheitswert", "\n \"0\": {\"name\": \"\", \"value\": \"on\"}", "10feffff0108", "00", "j"}, - {"x,,bi3:2,0=off;1=on,ja/nein,Wahrheitswert", "\n \"x\": {\"value\": \"on\", \"unit\": \"ja/nein\", \"comment\": \"Wahrheitswert\"}", "10feffff0108", "00", "vvvj"}, - {"x,,bi3:2,0=off;1=on,ja/nein,Wahrheitswert", "\n \"x\": {\"value\": 1}", "10feffff0108", "00", "vnj"}, - {"x,,bi3:2,0=off;1=on,ja/nein,Wahrheitswert", "\n \"x\": {\"value\": 1, \"unit\": \"ja/nein\", \"comment\": \"Wahrheitswert\"}", "10feffff0108", "00", "vvvnj"}, - {"x,,bi3:2,0=off;1=on,ja/nein,Wahrheitswert", "\n \"0\": {\"name\": \"x\", \"value\": 1}", "10feffff0108", "00", "nj"}, - {"x,,uch,1=test;2=high;3=off;0x10=on", "on", "10feffff0110", "00", ""}, - {"x,s,uch", "3", "1050ffff00", "0103", ""}, - {"x,,d2b,,°C,Aussentemperatur", "x=18.004 °C [Aussentemperatur]", "10fe0700090112", "00", "vvv"}, - {"x,,bti,,,,y,,bda,,,,z,,bdy", "21:04:58;26.10.2014;Sun", "10fe0700085804212610061406", "00", ""}, // combination - {"x,,bi3,,,,y,,bi5", "1;0", "10feffff0108", "00", ""}, // bit combination - {"x,,bi3,,,,y,,bi5", "1;1", "10feffff0128", "00", ""}, // bit combination - {"x,,bi3,,,,y,,bi5", "0;1", "10feffff0120", "00", ""}, // bit combination - {"x,,bi3,,,,y,,bi5", "0;0", "10feffff0100", "00", ""}, // bit combination - {"x,,bi3,,,,y,,bi7,,,,t,,uch", "0;0;9", "10feffff020009", "00", ""}, // bit combination - {"x,,bi6:2,,,,y,,bi0:2,,,,t,,uch", "2;1;9", "10feffff03800109", "00", ""}, // bit combination - {"x,,BI0;BI1;BI2;BI3;BI4;BI5;BI6;BI7", "0;0;1;0;0;0;0;0", "ff75b50900", "0104", ""}, // bits - {"x,,BI0;BI7;BI0", "0;0;0", "ff75b50900", "020000", ""}, // bits - {"x,,BI0;BI7;BI0", "0;0;1", "ff75b50900", "020001", ""}, // bits - {"x,,BI0;BI7;BI0", "0;1;0", "ff75b50900", "028000", ""}, // bits - {"x,,BI0;BI7;BI0", "0;1;1", "ff75b50900", "028001", ""}, // bits - {"x,m,BI0;BI1;BI2;BI3;BI4;BI5;BI6;BI7", "0;0;1;0;0;0;0;0", "ff75b5090104", "00", ""}, // bits - {"x,m,BI0;BI7;BI0", "0;0;0", "ff75b509020000", "00", ""}, // bits - {"x,m,BI0;BI7;BI0", "0;0;1", "ff75b509020001", "00", ""}, // bits - {"x,m,BI0;BI7;BI0", "0;1;0", "ff75b509028000", "00", ""}, // bits - {"x,m,BI0;BI7;BI0", "0;1;1", "ff75b509028001", "00", ""}, // bits - {"temp,d2b,,°C,Aussentemperatur", "", "", "", "t"}, // template with relative pos - {"x,,temp", "18.004", "10fe0700020112", "00", ""}, // reference to template - {"x,,temp,10", "1.8004", "10fe0700020112", "00", ""}, // reference to template, valid divisor product - {"x,,temp,-10", "", "", "", "c"}, // reference to template, invalid divisor product - {"relrel,d2b,,,,y,d1c", "", "", "", "t"}, // template struct with relative pos - {"x,,relrel", "18.004;9.5", "10fe070003011213", "00", ""}, // reference to template struct - {"trelrel,temp;temp", "", "", "", "t"}, // template struct with relative pos and ref to templates - {"x,,trelrel", "18.004;19.008", "10fe07000401120213", "00", ""}, // reference to template struct - {"x,,temp,,,,y,,d1c", "18.004;9.5", "10fe070003011213", "00", ""}, // reference to template, normal def - {"x,,temp;HEX:2", "18.004;13 14", "10fe07000401121314", "00", ""}, // reference to template and base type - {"x,,temp;HEX:2", "temp=18.004;=13 14", "10fe07000401121314", "00", "v"}, // reference to template and base type - {"x,,temp:degrees;HEX:2", "degrees=18.004;=13 14", "10fe07000401121314", "00", "v"}, // reference to template and base type - {"x,,uch;UCH;IGN;UCH", "41", "1008ffff00", "0426272829", "wi2"}, - {"x,,uch,,,,x,,uch,,,,x,,ign,,,,x,,uch,,,,", "41", "1008ffff00", "0426272829", "wi2"}, - {"x,,uch,,,,y,,uch,,,,x,,ign,,,,x,,uch,,,,", "41", "1008ffff00", "0426272829", "wIi1"}, - {"x,,uch,,,,y,,uch,,,,z,,ign,,,,x,,uch,,,,", "41", "1008ffff00", "0426272829", "wIi1"}, + {"x,,ign:10", "", "10fe07000a00000000000000000000", "00", ""}, + {"x,,ign:*", "", "10fe07000a00000000000000000000", "00", "W"}, + {"x,,ign,2", "", "", "", "c"}, + {"x,,str:10", "Hallo, Du!", "10fe07000a48616c6c6f2c20447521", "00", ""}, + {"x,,str:10", "Hallo, Du!", "10fe07000a48616c6c6f2c20447521", "00", ""}, + {"x,,str:10", "Hallo, Du ", "10fe07000a48616c6c6f2c20447520", "00", ""}, + {"x,,str:10", " ", "10fe07000a20202020202020202020", "00", ""}, + {"x,,str:10", "", "10fe07000a20202020202020202020", "00", "R"}, + {"x,,str:11", "", "10fe07000a20202020202020202020", "00", "rW"}, + {"x,,str:24", "abcdefghijklmnopqrstuvwx", "10fe0700186162636465666768696a6b6c6d6e6f707172737475767778", "00", ""}, + {"x,,str:*", "abcde", "10fe0700056162636465", "00", ""}, + {"x,,str,2", "", "", "", "c"}, + {"x,,str:10,=dummy", "", "10fe07000a48616c6c6f2044752120", "00", "W"}, + {"x,,str:10,==dummy", "", "10fe07000a48616c6c6f2044752120", "00", "rW"}, + {"x,,str:10,=dummy", "", "10fe07000a64756d6d792020202020", "00", ""}, + {"x,,str:10,==dummy", "", "10fe07000a64756d6d792020202020", "00", ""}, + {"x,,nts:10", "Hallo, Du!", "10fe07000a48616c6c6f2c20447521", "00", ""}, + {"x,,nts:10", "Hallo, Du!", "10fe07000a48616c6c6f2c20447521", "00", ""}, + {"x,,nts:10", "Hallo, Du", "10fe07000a48616c6c6f2c20447500", "00", ""}, + {"x,,nts:10", " ", "10fe07000a20202020202020202020", "00", ""}, + {"x,,nts:10", "", "10fe07000a00000000000000000000", "00", ""}, + {"x,,nts:10", "abc", "10fe07000a6162630065666768696a", "00", "W"}, + {"x,,nts:11", "", "10fe07000a20202020202020202020", "00", "rW"}, + {"x,,nts:24", "abcdefghijklmnopqrstuvwx", "10fe0700186162636465666768696a6b6c6d6e6f707172737475767778", "00", ""}, + {"x,,nts:*", "abcde", "10fe0700056162636465", "00", "W"}, + {"x,,nts:*", "abcde", "10fe070006616263646500", "00", ""}, + {"x,,nts,2", "", "", "", "c"}, + {"x,,hex", "20", "10fe07000120", "00", ""}, + {"x,,hex:10", "48 61 6c 6c 6f 2c 20 44 75 21", "10fe07000a48616c6c6f2c20447521", "00", ""}, + {"x,,hex:*", "48 61 6c 6c 6f", "10fe07000548616c6c6f", "00", ""}, + {"x,,hex:11", "", "10fe07000a48616c6c6f2c20447521", "00", "rW"}, + {"x,,hex,2", "", "", "", "c"}, + {"x,,hex:5,=48 61 6c 6c 6f", "", "10fe070005ababababab", "00", "W"}, + {"x,,hex:5,==48 61 6c 6c 6f", "", "10fe070005ababababab", "00", "rW"}, + {"x,,hex:5,=48 61 6c 6c 6f", "", "10fe07000548616c6c6f", "00", ""}, + {"x,,hex:5,==48 61 6c 6c 6f", "", "10fe07000548616c6c6f", "00", ""}, + {"x,,bda", "26.10.2014", "10fe07000426100614", "00", ""}, // Sunday + {"x,,bda", "01.01.2000", "10fe07000401010500", "00", ""}, // Saturday + {"x,,bda", "31.12.2099", "10fe07000431120399", "00", ""}, // Thursday + {"x,,bda", "-.-.-", "10fe070004ffff00ff", "00", ""}, + {"x,,bda", "", "10fe07000432100014", "00", "rw"}, + {"x,,bda:3", "26.10.2014", "10fe070003261014", "00", ""}, + {"x,,bda:3", "01.01.2000", "10fe070003010100", "00", ""}, + {"x,,bda:3", "31.12.2099", "10fe070003311299", "00", ""}, + {"x,,bda:3", "-.-.-", "10fe070003ffffff", "00", ""}, + {"x,,bda:3", "", "10fe070003321299", "00", "rw"}, + {"x,,bda,2", "", "", "", "c"}, + {"x,,hda", "26.10.2014", "10fe0700041a0a070e", "00", ""}, // Sunday + {"x,,hda", "01.01.2000", "10fe07000401010600", "00", ""}, // Saturday + {"x,,hda", "31.12.2099", "10fe0700041f0c0463", "00", ""}, // Thursday + {"x,,hda", "-.-.-", "10fe070004ffff00ff", "00", ""}, + {"x,,hda", "", "10fe070004200c0463", "00", "rw"}, + {"x,,hda:3", "26.10.2014", "10fe0700031a0a0e", "00", ""}, + {"x,,hda:3", "01.01.2000", "10fe070003010100", "00", ""}, + {"x,,hda:3", "31.12.2099", "10fe0700031f0c63", "00", ""}, + {"x,,hda:3", "-.-.-", "10fe070003ffffff", "00", ""}, + {"x,,hda:3", "", "10fe070003200c63", "00", "rw"}, + {"x,,hda,2", "", "", "", "c"}, + {"x,,day", "26.10.2014", "10fe070002d0a3", "00", ""}, + {"x,,day", "01.01.2000", "10fe070002ac8e", "00", ""}, + {"x,,day", "31.12.2078", "10fe07000262ff", "00", ""}, + {"x,,day", "-.-.-", "10fe070002ffff", "00", ""}, + {"x,,day", "", "10fe0700020000", "00", "Rw"}, + {"x,,dtm", "01.01.2009 00:00", "10fe07000400000000", "00", ""}, + {"x,,dtm", "31.12.2099 23:59", "10fe0700041f4eda02", "00", ""}, + {"x,,dtm", "16.12.2020 16:51", "10fe07000453f85f00", "00", ""}, + {"x,,bti", "21:04:58", "10fe070003580421", "00", ""}, + {"x,,bti", "00:00:00", "10fe070003000000", "00", ""}, + {"x,,bti", "23:59:59", "10fe070003595923", "00", ""}, + {"x,,bti", "-:-:-", "10fe070003ffffff", "00", ""}, + {"x,,bti", "", "10fe070003605923", "00", "rw"}, + {"x,,bti,2", "", "", "", "c"}, + {"x,,hti", "21:04:58", "10fe07000315043a", "00", ""}, + {"x,,hti", "-:-:-", "10fe070003ffffff", "00", ""}, + {"x,,hti,2", "", "", "", "c"}, + {"x,,vti", "21:04:58", "10fe0700033a0415", "00", ""}, + {"x,,vti", "-:-:-", "10fe070003636363", "00", ""}, + {"x,,vti,2", "", "", "", "c"}, + {"x,,btm", "21:04", "10fe0700020421", "00", ""}, + {"x,,btm", "00:00", "10fe0700020000", "00", ""}, + {"x,,btm", "23:59", "10fe0700025923", "00", ""}, + {"x,,btm", "24:00", "10fe0700020024", "00", ""}, + {"x,,btm", "-:-", "10fe070002ffff", "00", ""}, + {"x,,btm", "", "10fe0700025924", "00", "rw"}, + {"x,,btm", "24:01", "10fe0700020124", "00", "rw"}, + {"x,,btm,2", "", "", "", "c"}, + {"x,,htm", "21:04", "10fe0700021504", "00", ""}, + {"x,,htm", "00:00", "10fe0700020000", "00", ""}, + {"x,,htm", "23:59", "10fe070002173b", "00", ""}, + {"x,,htm", "24:00", "10fe0700021800", "00", ""}, + {"x,,htm", "-:-", "10fe070002ffff", "00", ""}, + {"x,,htm", "", "10fe070002183b", "00", "rw"}, + {"x,,htm", "24:01", "10fe0700021801", "00", "rw"}, + {"x,,htm,2", "", "", "", "c"}, + {"x,,vtm", "21:04", "10fe0700020415", "00", ""}, + {"x,,vtm", "00:00", "10fe0700020000", "00", ""}, + {"x,,vtm", "23:59", "10fe0700023b17", "00", ""}, + {"x,,vtm", "24:00", "10fe0700020018", "00", ""}, + {"x,,vtm", "-:-", "10fe070002ffff", "00", ""}, + {"x,,vtm", "", "10fe0700023b18", "00", "rw"}, + {"x,,vtm", "24:01", "10fe0700020118", "00", "rw"}, + {"x,,vtm,2", "", "", "", "c"}, + {"x,,min", "21:04", "10fe070002f004", "00", ""}, + {"x,,min", "00:00", "10fe0700020000", "00", ""}, + {"x,,min", "23:59", "10fe0700029f05", "00", ""}, + {"x,,min", "24:00", "10fe070002a005", "00", ""}, + {"x,,min", "-:-", "10fe070002ffff", "00", ""}, + {"x,,min", "", "10fe070002bbbb", "00", "rw"}, + {"x,,min", "24:01", "10fe070002a105", "00", "rw"}, + {"x,,min,2", "", "", "", "c"}, + {"x,,ttm", "22:40", "10fe07000188", "00", ""}, + {"x,,ttm", "00:00", "10fe07000100", "00", ""}, + {"x,,ttm", "23:50", "10fe0700018f", "00", ""}, + {"x,,ttm", "23:54", "10fe0700018f", "00", "R"}, + {"x,,ttm", "23:55", "10fe07000190", "00", "R"}, + {"x,,ttm", "23:56", "10fe07000190", "00", "R"}, + {"x,,ttm", "23:59", "10fe07000190", "00", "R"}, + {"x,,ttm", "-:-", "10fe07000190", "00", ""}, + {"x,,ttm", "", "10fe07000191", "00", "rw"}, + {"x,,ttm,2", "", "", "", "c"}, + {"x,,tth", "22:30", "10fe0700012d", "00", ""}, + {"x,,tth", "00:30", "10fe07000101", "00", ""}, + {"x,,tth", "23:31", "10fe0700012f", "00", "R"}, + {"x,,tth", "23:44", "10fe0700012f", "00", "R"}, + {"x,,tth", "23:45", "10fe07000130", "00", "R"}, + {"x,,tth", "24:00", "10fe07000130", "00", ""}, + {"x,,tth", "-:-", "10fe07000100", "00", ""}, + {"x,,tth", "", "10fe07000131", "00", "rw"}, + {"x,,tth,2", "", "", "", "c"}, + {"x,,tth,,,,y,,bi6:2", "23:30;0", "10fe0700012f", "00", ""}, // bit combination + {"x,,tth,,,,y,,bi6:2", "23:30;2", "10fe070001af", "00", ""}, // bit combination + {"x,,ttq", "22:30", "10fe0700015a", "00", ""}, + {"x,,ttq", "00:30", "10fe07000102", "00", ""}, + {"x,,ttq", "23:31", "10fe0700015e", "00", "R"}, + {"x,,ttq", "23:44", "10fe0700015f", "00", "R"}, + {"x,,ttq", "23:45", "10fe0700015f", "00", ""}, + {"x,,ttq", "24:00", "10fe07000160", "00", ""}, + {"x,,ttq", "-:-", "10fe07000100", "00", ""}, + {"x,,ttq,,,,,,ttq", "23:00;05:45", "10fe0700025c17", "00", ""}, + {"x,,ttq,,,,,,bi7,,,,,,ttq", "23:00;0;05:45", "10fe0700025c17", "00", ""}, + {"x,,ttq,,,,,,bi7,,,,,,ttq", "23:00;1;05:45", "10fe070002dc17", "00", ""}, + {"x,,ttq", "", "10fe07000161", "00", "rw"}, + {"x,,ttq,2", "", "", "", "c"}, + {"x,,ttq,,,,y,,bi7", "23:45;0", "10fe0700015f", "00", ""}, // bit combination + {"x,,ttq,,,,y,,bi7", "23:45;1", "10fe070001df", "00", ""}, // bit combination + {"x,,bdy", "Mon", "10fe07000100", "00", ""}, + {"x,,bdy", "Sun", "10fe07000106", "00", ""}, + {"x,,bdy", "8", "10fe07000108", "00", "w"}, + {"x,,hdy", "Mon", "10fe07000101", "00", ""}, + {"x,,hdy", "Sun", "10fe07000107", "00", ""}, + {"x,,hdy", "8", "10fe07000108", "00", "w"}, + {"x,,pin", "1234", "10feffff021234", "00", ""}, + {"x,,pin", "0000", "10feffff020000", "00", ""}, + {"x,,pin", "9999", "10feffff029999", "00", ""}, + {"x,,pin", "", "10feffff020000", "00", "Rw"}, + {"x,,pin", "100", "10feffff020100", "00", "R"}, + {"x,,bcd", "26", "10feffff0126", "00", ""}, + {"x,,bcd", "0", "10feffff0100", "00", ""}, + {"x,,bcd", "99", "10feffff0199", "00", ""}, + {"x,,bcd", "100", "10feffff0199", "00", "Rw"}, + {"x,,bcd", "-", "10feffff01ff", "00", ""}, + {"x,,bcd", "", "10feffff019a", "00", "rw"}, + {"x,,bcd:1", "26", "10feffff0126", "00", ""}, + {"x,,bcd:1", "0", "10feffff0100", "00", ""}, + {"x,,bcd:1", "99", "10feffff0199", "00", ""}, + {"x,,bcd:1", "100", "10feffff0199", "00", "Rw"}, + {"x,,bcd:1", "-", "10feffff01ff", "00", ""}, + {"x,,bcd:1", "", "10feffff019a", "00", "rw"}, + {"x,,bcd:2", "126", "10feffff022601", "00", ""}, + {"x,,bcd:2", "0", "10feffff020000", "00", ""}, + {"x,,bcd:2", "9999", "10feffff029999", "00", ""}, + {"x,,bcd:2", "10000", "10feffff029999", "00", "Rw"}, + {"x,,bcd:2", "-", "10feffff02ffff", "00", ""}, + {"x,,bcd:2", "", "10feffff029a00", "00", "rw"}, + {"x,,bcd:3", "12346", "10feffff03462301", "00", ""}, + {"x,,bcd:3", "0", "10feffff03000000", "00", ""}, + {"x,,bcd:3", "999999", "10feffff03999999", "00", ""}, + {"x,,bcd:3", "1000000", "10feffff03999999", "00", "Rw"}, + {"x,,bcd:3", "-", "10feffff03ffffff", "00", ""}, + {"x,,bcd:3", "", "10feffff03009a00", "00", "rw"}, + {"x,,bcd:4", "1234567", "10feffff0467452301", "00", ""}, + {"x,,bcd:4", "0", "10feffff0400000000", "00", ""}, + {"x,,bcd:4", "99999999", "10feffff0499999999", "00", ""}, + {"x,,bcd:4", "100000000", "10feffff0499999999", "00", "Rw"}, + {"x,,bcd:4", "-", "10feffff04ffffffff", "00", ""}, + {"x,,bcd:4", "", "10feffff0400009a00", "00", "rw"}, + {"x,,hcd:1", "26", "10feffff011a", "00", ""}, + {"x,,hcd:1", "0", "10feffff0100", "00", ""}, + {"x,,hcd:1", "99", "10feffff0163", "00", ""}, + {"x,,hcd:1", "100", "10feffff0163", "00", "Rw"}, + {"x,,hcd:1", "", "10feffff019a", "00", "rw"}, + {"x,,hcd:2", "126", "10feffff021a01", "00", ""}, + {"x,,hcd:2", "0", "10feffff020000", "00", ""}, + {"x,,hcd:2", "9999", "10feffff026363", "00", ""}, + {"x,,hcd:2", "10000", "10feffff026363", "00", "Rw"}, + {"x,,hcd:2", "", "10feffff029a00", "00", "rw"}, + {"x,,hcd:3", "12346", "10feffff032e1701", "00", ""}, + {"x,,hcd:3", "0", "10feffff03000000", "00", ""}, + {"x,,hcd:3", "999999", "10feffff03636363", "00", ""}, + {"x,,hcd:3", "1000000", "10feffff03636363", "00", "Rw"}, + {"x,,hcd:3", "", "10feffff03009a00", "00", "rw"}, + {"x,,hcd:4", "1234567", "10feffff04432d1701", "00", ""}, + {"x,,hcd:4", "0", "10feffff0400000000", "00", ""}, + {"x,,hcd:4", "99999999", "10feffff0463636363", "00", ""}, + {"x,,hcd:4", "100000000", "10feffff0463636363", "00", "Rw"}, + {"x,,hcd", "", "10feffff0400006400", "00", "rw"}, + {"x,,hcd", "1234567", "10feffff04432d1701", "00", ""}, + {"x,,hcd", "0", "10feffff0400000000", "00", ""}, + {"x,,hcd", "99999999", "10feffff0463636363", "00", ""}, + {"x,,hcd", "100000000", "10feffff0463636363", "00", "Rw"}, + {"x,,hcd", "", "10feffff0400006400", "00", "rw"}, + {"x,,str:16", "0123456789ABCDEF", "10feffff1030313233343536373839414243444546", "00", ""}, + {"x,,uch:17", "", "10feffff00", "00", "c"}, + {"x,s,uch", "0", "1025ffff0310111213", "0300010203", "W"}, + {"x,s,uch", "0", "1025ffff00", "0100", ""}, + {"x,s,uch,,,,y,m,uch", "3;2", "1025ffff0103", "0102", ""}, + {"x,,uch", "38", "10feffff0126", "00", ""}, + {"x,,uch", "38.5", "10feffff0126", "00", "R"}, + {"x,,uch", "0", "10feffff0100", "00", ""}, + {"x,,uch", "254", "10feffff01fe", "00", ""}, + {"x,,uch", "-", "10feffff01ff", "00", ""}, + {"x,,uch,10", "3.8", "10feffff0126", "00", ""}, + {"x,,uch,-10", "380", "10feffff0126", "00", ""}, + {"x,,uch,=48", "", "10feffff01ab", "00", "W"}, + {"x,,uch,==48", "", "10feffff01ab", "00", "rW"}, + {"x,,uch,=48", "", "10feffff0130", "00", ""}, + {"x,,uch,==48", "", "10feffff0130", "00", ""}, + {"x,,sch", "-90", "10feffff01a6", "00", ""}, + {"x,,sch", "0", "10feffff0100", "00", ""}, + {"x,,sch", "-1", "10feffff01ff", "00", ""}, + {"x,,sch", "-", "10feffff0180", "00", ""}, + {"x,,sch", "-127", "10feffff0181", "00", ""}, + {"x,,sch", "127", "10feffff017f", "00", ""}, + {"x,,sch,10", "-9.0", "10feffff01a6", "00", ""}, + {"x,,sch,-10", "-900", "10feffff01a6", "00", ""}, + {"x,,d1b", "-90", "10feffff01a6", "00", ""}, + {"x,,d1b", "0", "10feffff0100", "00", ""}, + {"x,,d1b", "-1", "10feffff01ff", "00", ""}, + {"x,,d1b", "-", "10feffff0180", "00", ""}, + {"x,,d1b", "-127", "10feffff0181", "00", ""}, + {"x,,d1b", "127", "10feffff017f", "00", ""}, + {"x,,d1b,-10", "-900", "10feffff01a6", "00", ""}, + {"x,,d1c", "19.5", "10feffff0127", "00", ""}, + {"x,,d1c", "0.0", "10feffff0100", "00", ""}, + {"x,,d1c", "100.0", "10feffff01c8", "00", ""}, + {"x,,d1c", "-", "10feffff01ff", "00", ""}, + {"x,,uin", "38", "10feffff022600", "00", ""}, + {"x,,uin", "0", "10feffff020000", "00", ""}, + {"x,,uin", "65534", "10feffff02feff", "00", ""}, + {"x,,uin", "-", "10feffff02ffff", "00", ""}, + {"x,,uin,10", "3.8", "10feffff022600", "00", ""}, + {"x,,uin,-10", "380", "10feffff022600", "00", ""}, + {"x,,uir", "38", "10feffff020026", "00", ""}, + {"x,,uir", "0", "10feffff020000", "00", ""}, + {"x,,uir", "65534", "10feffff02fffe", "00", ""}, + {"x,,uir", "-", "10feffff02ffff", "00", ""}, + {"x,,uir,10", "3.8", "10feffff020026", "00", ""}, + {"x,,uir,-10", "380", "10feffff020026", "00", ""}, + {"uin10,uin,-10", "", "", "", "t"}, // template + {"x,,uin10", "380", "10feffff022600", "00", ""}, // template reference + {"x,,uin10,-10", "3800", "10feffff022600", "00", ""}, // template reference, valid divisor product + {"x,,uin10,10", "", "", "", "c"}, // template reference, invalid divisor product + {"x,,sin", "-90", "10feffff02a6ff", "00", ""}, + {"x,,sin", "0", "10feffff020000", "00", ""}, + {"x,,sin", "-1", "10feffff02ffff", "00", ""}, + {"x,,sin", "-", "10feffff020080", "00", ""}, + {"x,,sin", "-32767", "10feffff020180", "00", ""}, + {"x,,sin", "32767", "10feffff02ff7f", "00", ""}, + {"x,,sin,10", "-9.0", "10feffff02a6ff", "00", ""}, + {"x,,sin,-10", "-900", "10feffff02a6ff", "00", ""}, + {"x,,sir", "-90", "10feffff02ffa6", "00", ""}, + {"x,,sir", "0", "10feffff020000", "00", ""}, + {"x,,sir", "-1", "10feffff02ffff", "00", ""}, + {"x,,sir", "-", "10feffff028000", "00", ""}, + {"x,,sir", "-32767", "10feffff028001", "00", ""}, + {"x,,sir", "32767", "10feffff027fff", "00", ""}, + {"x,,sir,10", "-9.0", "10feffff02ffa6", "00", ""}, + {"x,,sir,-10", "-900", "10feffff02ffa6", "00", ""}, + {"x,,u3n", "38", "10feffff03260000", "00", ""}, + {"x,,u3n", "0", "10feffff03000000", "00", ""}, + {"x,,u3n", "16777214", "10feffff03feffff", "00", ""}, + {"x,,u3n", "-", "10feffff03ffffff", "00", ""}, + {"x,,u3n,10", "3.8", "10feffff03260000", "00", ""}, + {"x,,u3n,-10", "380", "10feffff03260000", "00", ""}, + {"x,,u3r", "38", "10feffff03000026", "00", ""}, + {"x,,u3r", "0", "10feffff03000000", "00", ""}, + {"x,,u3r", "16777214", "10feffff03fffffe", "00", ""}, + {"x,,u3r", "-", "10feffff03ffffff", "00", ""}, + {"x,,u3r,10", "3.8", "10feffff03000026", "00", ""}, + {"x,,u3r,-10", "380", "10feffff03000026", "00", ""}, + {"x,,s3n", "-90", "10feffff03a6ffff", "00", ""}, + {"x,,s3n", "0", "10feffff03000000", "00", ""}, + {"x,,s3n", "-1", "10feffff03ffffff", "00", ""}, + {"x,,s3n", "-", "10feffff03000080", "00", ""}, + {"x,,s3n", "-8388607", "10feffff03010080", "00", ""}, + {"x,,s3n", "8388607", "10feffff03ffff7f", "00", ""}, + {"x,,s3n,10", "-9.0", "10feffff03a6ffff", "00", ""}, + {"x,,s3n,-10", "-900", "10feffff03a6ffff", "00", ""}, + {"x,,s3r", "-90", "10feffff03ffffa6", "00", ""}, + {"x,,s3r", "0", "10feffff03000000", "00", ""}, + {"x,,s3r", "-1", "10feffff03ffffff", "00", ""}, + {"x,,s3r", "-", "10feffff03800000", "00", ""}, + {"x,,s3r", "-8388607", "10feffff03800001", "00", ""}, + {"x,,s3r", "8388607", "10feffff037fffff", "00", ""}, + {"x,,s3r,10", "-9.0", "10feffff03ffffa6", "00", ""}, + {"x,,s3r,-10", "-900", "10feffff03ffffa6", "00", ""}, + {"x,,flt", "-0.090", "10feffff02a6ff", "00", ""}, + {"x,,flt", "0.000", "10feffff020000", "00", ""}, + {"x,,flt", "-0.001", "10feffff02ffff", "00", ""}, + {"x,,flt", "-", "10feffff020080", "00", ""}, + {"x,,flt", "-32.767", "10feffff020180", "00", ""}, + {"x,,flt", "32.767", "10feffff02ff7f", "00", ""}, + {"x,,flr", "-0.090", "10feffff02ffa6", "00", ""}, + {"x,,flr", "0.000", "10feffff020000", "00", ""}, + {"x,,flr", "-0.001", "10feffff02ffff", "00", ""}, + {"x,,flr", "-", "10feffff028000", "00", ""}, + {"x,,flr", "-32.767", "10feffff028001", "00", ""}, + {"x,,flr", "32.767", "10feffff027fff", "00", ""}, + {"x,,exp", "-0.09", "10feffff04ec51b8bd", "00", ""}, + {"x,,exp", "0.0", "10feffff0400000000", "00", ""}, + {"x,,exp", "-0.001", "10feffff046f1283ba", "00", ""}, + {"x,,exp", "-", "10feffff040000807f", "00", ""}, + {"x,,exp", "-32.767", "10feffff04681103c2", "00", ""}, + {"x,,exp,1000", "-0.000090000", "10feffff04ec51b8bd", "00", ""}, + {"x,,exp,-100", "-9", "10feffff04ec51b8bd", "00", ""}, + {"x,,exp", "0.25", "10feffff040000803e", "00", ""}, + {"x,,exp", "-", "10feffff040000c07f", "00", "W"}, + {"x,,exr", "-0.09", "10feffff04bdb851ec", "00", ""}, + {"x,,exr", "0.0", "10feffff0400000000", "00", ""}, + {"x,,exr", "-0.001", "10feffff04ba83126f", "00", ""}, + {"x,,exr", "-", "10feffff047f800000", "00", ""}, + {"x,,exr", "-32.767", "10feffff04c2031168", "00", ""}, + {"x,,exr,1000", "-0.000090000", "10feffff04bdb851ec", "00", ""}, + {"x,,exr,-100", "-9", "10feffff04bdb851ec", "00", ""}, + {"x,,d2b", "18.004", "10fe0700020112", "00", ""}, + {"x,,d2b", "0.000", "10feffff020000", "00", ""}, + {"x,,d2b", "-0.004", "10feffff02ffff", "00", ""}, + {"x,,d2b", "-", "10feffff020080", "00", ""}, + {"x,,d2b", "-127.996", "10feffff020180", "00", ""}, + {"x,,d2b", "127.996", "10feffff02ff7f", "00", ""}, + {"x,,d2c", "288.06", "10fe0700020112", "00", ""}, + {"x,,d2c", "0.00", "10feffff020000", "00", ""}, + {"x,,d2c", "-0.06", "10feffff02ffff", "00", ""}, + {"x,,d2c", "-", "10feffff020080", "00", ""}, + {"x,,d2c", "-2047.94", "10feffff020180", "00", ""}, + {"x,,d2c", "2047.94", "10feffff02ff7f", "00", ""}, + {"x,,ulg", "38", "10feffff0426000000", "00", ""}, + {"x,,ulg", "0", "10feffff0400000000", "00", ""}, + {"x,,ulg", "4294967294", "10feffff04feffffff", "00", ""}, + {"x,,ulg", "-", "10feffff04ffffffff", "00", ""}, + {"x,,ulg,10", "3.8", "10feffff0426000000", "00", ""}, + {"x,,ulg,-10", "380", "10feffff0426000000", "00", ""}, + {"x,,ulg,0x0FF0F00F = VRT 350 ;0x33CCCC33=VRT 360;0x3CC3C33C=SD 17;0x66999966=SD 37;0x69969669=VRT 360+", "VRT 350", "10feffff040FF0F00F", "00", ""}, + {"x,,ulg,0x=test", "", "10feffff040FF0F00F", "00", "c"}, + {"x,,ulr", "38", "10feffff0400000026", "00", ""}, + {"x,,ulr", "0", "10feffff0400000000", "00", ""}, + {"x,,ulr", "4294967294", "10feffff04fffffffe", "00", ""}, + {"x,,ulr", "-", "10feffff04ffffffff", "00", ""}, + {"x,,ulr,10", "3.8", "10feffff0400000026", "00", ""}, + {"x,,ulr,-10", "380", "10feffff0400000026", "00", ""}, + {"x,,slg", "-90", "10feffff04a6ffffff", "00", ""}, + {"x,,slg", "0", "10feffff0400000000", "00", ""}, + {"x,,slg", "-1", "10feffff04ffffffff", "00", ""}, + {"x,,slg,10", "-9.0", "10feffff04a6ffffff", "00", ""}, + {"x,,slg,-10", "-900", "10feffff04a6ffffff", "00", ""}, + {"x,,slr", "-90", "10feffff04ffffffa6", "00", ""}, + {"x,,slr", "0", "10feffff0400000000", "00", ""}, + {"x,,slr", "-1", "10feffff04ffffffff", "00", ""}, + {"x,,slr,10", "-9.0", "10feffff04ffffffa6", "00", ""}, + {"x,,slr,-10", "-900", "10feffff04ffffffa6", "00", ""}, + {"x,,bi3", "1", "10feffff0108", "00", ""}, + {"x,,bi3", "0", "10feffff0100", "00", ""}, + {"x,,bi3,0=off;1=on", "on", "10feffff0108", "00", ""}, + {"x,,bi3,0=off;1=on", "off", "10feffff0100", "00", ""}, + {"x,,bi3:2", "1", "10feffff0108", "00", ""}, + {"x,,bi3:2", "1", "10feffff01ef", "00", "W"}, + {"x,,bi3:2", "0", "10feffff0100", "00", ""}, + {"x,,bi3:2", "3", "10feffff0118", "00", ""}, + {"x,,bi3:2,1=on", "on", "10feffff0108", "00", ""}, + {"x,,bi3:2,1=on", "-", "10feffff0100", "00", ""}, + {"x,,bi3:2,0=off;1=on;2=auto;3=eco", "auto", "10feffff0110", "00", ""}, + {"x,,bi3:2,0=off;1=on;2=auto;3=eco", "2.5", "10feffff0110", "00", "R"}, + {"x,,bi3:2,0=off;1=on", "on", "10feffff0108", "00", ""}, + {"x,,bi3:2,0=off;1=on", "off", "10feffff0100", "00", ""}, + {"x,,bi3:2,0=off;1=on", "1", "10feffff0108", "00", "n"}, + {"x,,bi3:2,0=off;1=on,ja/nein,Wahrheitswert", "x=on ja/nein [Wahrheitswert]", "10feffff0108", "00", "vvv"}, + {"x,,bi3:2,0=off;1=on,ja/nein,Wahrheitswert", "x=1 ja/nein [Wahrheitswert]", "10feffff0108", "00", "vvvn"}, + {"x,,bi3:2,0=off;1=on,ja/nein,Wahrheitswert", "\n \"x\": {\"value\": \"on\"}", "10feffff0108", "00", "vj"}, + {",,bi3:2,0=off;1=on,ja/nein,Wahrheitswert", "\n \"0\": {\"name\": \"\", \"value\": \"on\"}", "10feffff0108", "00", "vj"}, + {",,bi3:2,0=off;1=on,ja/nein,Wahrheitswert", "\n \"0\": {\"name\": \"\", \"value\": \"on\"}", "10feffff0108", "00", "j"}, + {"x,,bi3:2,0=off;1=on,ja/nein,Wahrheitswert", "\n \"x\": {\"value\": \"on\", \"unit\": \"ja/nein\", \"comment\": \"Wahrheitswert\"}", "10feffff0108", "00", "vvvj"}, + {"x,,bi3:2,0=off;1=on,ja/nein,Wahrheitswert", "\n \"x\": {\"value\": 1}", "10feffff0108", "00", "vnj"}, + {"x,,bi3:2,0=off;1=on,ja/nein,Wahrheitswert", "\n \"x\": {\"value\": 1, \"unit\": \"ja/nein\", \"comment\": \"Wahrheitswert\"}", "10feffff0108", "00", "vvvnj"}, + {"x,,bi3:2,0=off;1=on,ja/nein,Wahrheitswert", "\n \"0\": {\"name\": \"x\", \"value\": 1}", "10feffff0108", "00", "nj"}, + {"x,,uch,1=test;2=high;3=off;0x10=on", "on", "10feffff0110", "00", ""}, + {"x,s,uch", "3", "1050ffff00", "0103", ""}, + {"x,,d2b,,°C,Aussentemperatur", "x=18.004 °C [Aussentemperatur]", "10fe0700090112", "00", "vvv"}, + {"x,,bti,,,,y,,bda,,,,z,,bdy", "21:04:58;26.10.2014;Sun", "10fe0700085804212610061406", "00", ""}, // combination + {"x,,bi3,,,,y,,bi5", "1;0", "10feffff0108", "00", ""}, // bit combination + {"x,,bi3,,,,y,,bi5", "1;1", "10feffff0128", "00", ""}, // bit combination + {"x,,bi3,,,,y,,bi5", "0;1", "10feffff0120", "00", ""}, // bit combination + {"x,,bi3,,,,y,,bi5", "0;0", "10feffff0100", "00", ""}, // bit combination + {"x,,bi3,,,,y,,bi7,,,,t,,uch", "0;0;9", "10feffff020009", "00", ""}, // bit combination + {"x,,bi6:2,,,,y,,bi0:2,,,,t,,uch", "2;1;9", "10feffff03800109", "00", ""}, // bit combination + {"x,,BI0;BI1;BI2;BI3;BI4;BI5;BI6;BI7", "0;0;1;0;0;0;0;0", "ff75b50900", "0104", ""}, // bits + {"x,,BI0;BI7;BI0", "0;0;0", "ff75b50900", "020000", ""}, // bits + {"x,,BI0;BI7;BI0", "0;0;1", "ff75b50900", "020001", ""}, // bits + {"x,,BI0;BI7;BI0", "0;1;0", "ff75b50900", "028000", ""}, // bits + {"x,,BI0;BI7;BI0", "0;1;1", "ff75b50900", "028001", ""}, // bits + {"x,m,BI0;BI1;BI2;BI3;BI4;BI5;BI6;BI7", "0;0;1;0;0;0;0;0", "ff75b5090104", "00", ""}, // bits + {"x,m,BI0;BI7;BI0", "0;0;0", "ff75b509020000", "00", ""}, // bits + {"x,m,BI0;BI7;BI0", "0;0;1", "ff75b509020001", "00", ""}, // bits + {"x,m,BI0;BI7;BI0", "0;1;0", "ff75b509028000", "00", ""}, // bits + {"x,m,BI0;BI7;BI0", "0;1;1", "ff75b509028001", "00", ""}, // bits + {"temp,d2b,,°C,Aussentemperatur", "", "", "", "t"}, // template with relative pos + {"x,,temp", "18.004", "10fe0700020112", "00", ""}, // reference to template + {"x,,temp,10", "1.8004", "10fe0700020112", "00", ""}, // reference to template, valid divisor product + {"x,,temp,-10", "", "", "", "c"}, // reference to template, invalid divisor product + {"relrel,d2b,,,,y,d1c", "", "", "", "t"}, // template struct with relative pos + {"x,,relrel", "18.004;9.5", "10fe070003011213", "00", ""}, // reference to template struct + {"trelrel,temp;temp", "", "", "", "t"}, // template struct with relative pos and ref to templates + {"x,,trelrel", "18.004;19.008", "10fe07000401120213", "00", ""}, // reference to template struct + {"x,,temp,,,,y,,d1c", "18.004;9.5", "10fe070003011213", "00", ""}, // reference to template, normal def + {"x,,temp;HEX:2", "18.004;13 14", "10fe07000401121314", "00", ""}, // reference to template and base type + {"x,,temp;HEX:2", "temp=18.004;=13 14", "10fe07000401121314", "00", "v"}, // reference to template and base type + {"x,,temp:degrees;HEX:2", "degrees=18.004;=13 14", "10fe07000401121314", "00", "v"}, // reference to template and base type + {"x,,uch;UCH;IGN;UCH", "41", "1008ffff00", "0426272829", "wi2"}, + {"x,,uch,,,,x,,uch,,,,x,,ign,,,,x,,uch,,,,", "41", "1008ffff00", "0426272829", "wi2"}, + {"x,,uch,,,,y,,uch,,,,x,,ign,,,,x,,uch,,,,", "41", "1008ffff00", "0426272829", "wIi1"}, + {"x,,uch,,,,y,,uch,,,,z,,ign,,,,x,,uch,,,,", "41", "1008ffff00", "0426272829", "wIi1"}, }; DataFieldTemplates* templates = new DataFieldTemplates(); unsigned int lineNo = 0; @@ -584,7 +587,7 @@ int main() { result = templates->readLineFromStream(&isstr, __FILE__, false, &lineNo, &row, &errorDescription, false, nullptr, nullptr); if (result != RESULT_OK) { cout << "\"" << check[0] << "\": template read error: " << getResultCode(result) << ", " - << errorDescription << endl; + << errorDescription << endl; error = true; } continue; @@ -596,7 +599,7 @@ int main() { result = reader.readLineFromStream(&dummystr, __FILE__, false, &lineNo, &row, &errorDescription, false, nullptr, nullptr); if (result != RESULT_OK) { cout << "\"" << check[0] << "\": read header error: " << getResultCode(result) << ", " << errorDescription - << endl; + << endl; error = true; continue; } @@ -679,22 +682,22 @@ int main() { if (failedWrite) { if (result >= RESULT_OK) { cout << " failed write " << fields->getName(-1) << " >" - << expectStr << "< error: unexpectedly succeeded" << endl; + << expectStr << "< error: unexpectedly succeeded" << endl; error = true; } else { cout << " failed write " << fields->getName(-1) << " >" - << expectStr << "< OK" << endl; + << expectStr << "< OK" << endl; } } else if (result < RESULT_OK) { cout << " write " << fields->getName(-1) << " >" << expectStr - << "< error: " << getResultCode(result) << endl; + << "< error: " << getResultCode(result) << endl; error = true; } else { writeMstr.adjustHeader(); writeSstr.adjustHeader(); bool match = mstr == writeMstr && sstr == writeSstr; verify(failedWriteMatch, "write", expectStr, match, mstr.getStr() + " " + sstr.getStr(), - writeMstr.getStr() + " " + writeSstr.getStr()); + writeMstr.getStr() + " " + writeSstr.getStr()); } } delete fields;