From 6e41246d42e6062c5214db5cb75685c32b7b329f Mon Sep 17 00:00:00 2001 From: john30 Date: Sat, 30 Jan 2016 18:38:43 +0100 Subject: [PATCH] added null terminated and filled string --- src/lib/ebus/data.cpp | 18 ++++++++++++------ src/lib/ebus/test/test_data.cpp | 12 +++++++++++- 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/src/lib/ebus/data.cpp b/src/lib/ebus/data.cpp index 1d49ee9e..43f79c7b 100644 --- a/src/lib/ebus/data.cpp +++ b/src/lib/ebus/data.cpp @@ -42,7 +42,8 @@ static const dataType_t uchDataType = { static const dataType_t dataTypes[] = { {"IGN",MAX_LEN*8,bt_str, IGN|ADJ, 0, 1, 0, 0}, // >= 1 byte ignored data stringDataType, - {"HEX",MAX_LEN*8,bt_hexstr, ADJ, 0, 2, 47, 0}, // >= 1 byte hex digit string, usually separated by space, e.g. 0a 1b 2c 3d + {"NTS",MAX_LEN*8,bt_str, ADJ, 0, 1, 0, 0}, // >= 1 byte character string filled up with 0x00 (null terminated string) + {"HEX",MAX_LEN*8,bt_hexstr, ADJ, 0, 2, 47, 0}, // >= 1 byte hex digit string, usually separated by space, e.g. 0a 1b 2c 3d {"BDA", 32, bt_dat, BCD, 0xff, 10, 10, 0}, // date with weekday in BCD, 01.01.2000 - 31.12.2099 (0x01,0x01,WW,0x00 - 0x31,0x12,WW,0x99, WW is weekday Mon=0x00 - Sun=0x06, replacement 0xff) {"BDA", 24, bt_dat, BCD, 0xff, 10, 10, 0}, // date in BCD, 01.01.2000 - 31.12.2099 (0x01,0x01,0x00 - 0x31,0x12,0x99, replacement 0xff) {"HDA", 32, bt_dat, 0, 0xff, 10, 10, 0}, // date with weekday, 01.01.2000 - 31.12.2099 (0x01,0x01,WW,0x00 - 0x1f,0x0c,WW,0x63, WW is weekday Mon=0x01 - Sun=0x07, replacement 0xff) @@ -724,7 +725,8 @@ result_t StringDataField::readSymbols(SymbolString& input, const unsigned char b default: if (ch < 0x20) ch = (unsigned char)m_dataType.replacement; - output << setw(0) << dec << static_cast(ch); + if (ch != 0x00) + output << setw(0) << dec << static_cast(ch); break; } last = ch; @@ -859,18 +861,22 @@ result_t StringDataField::writeSymbols(istringstream& input, } break; default: - if (input.eof()) + if (input.eof()) { value = m_dataType.replacement; - else { + } else { value = input.get(); if (input.eof() || value < 0x20) value = m_dataType.replacement; } break; } - if (remainder && input.eof() && i > 0) + if (remainder && input.eof() && i > 0) { + if (value == 0x00 && m_dataType.type == bt_str) { + output[baseOffset + offset] = 0; + offset += incr; + } break; - + } lastLast = last; last = value; if ((m_dataType.flags & BCD) != 0 && ((m_dataType.flags & REQ) != 0 || value != m_dataType.replacement)) { diff --git a/src/lib/ebus/test/test_data.cpp b/src/lib/ebus/test/test_data.cpp index 59725060..deff2d76 100644 --- a/src/lib/ebus/test/test_data.cpp +++ b/src/lib/ebus/test/test_data.cpp @@ -52,11 +52,21 @@ int main() {"x,,str:10", "Hallo, Du!", "10fe07000a48616c6c6f2c20447521", "00", ""}, {"x,,str:10", "Hallo, Du ", "10fe07000a48616c6c6f2c20447520", "00", ""}, {"x,,str:10", " ", "10fe07000a20202020202020202020", "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,,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: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", ""},