From d5dac022d7cefe29e7d52753eec69fc1418cac88 Mon Sep 17 00:00:00 2001 From: john30 Date: Sat, 26 Dec 2015 11:33:23 +0100 Subject: [PATCH 1/2] avoid umlauts in manufacturer name of scan message --- src/lib/ebus/data.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/ebus/data.cpp b/src/lib/ebus/data.cpp index 433e9f1c..8a1ada7a 100644 --- a/src/lib/ebus/data.cpp +++ b/src/lib/ebus/data.cpp @@ -1294,10 +1294,10 @@ DataFieldSet* DataFieldSet::getIdentFields() manufacturers[0x20] = "RAWE"; manufacturers[0x30] = "Satronic"; manufacturers[0x40] = "ENCON"; - manufacturers[0x50] = "Kromschröder"; + manufacturers[0x50] = "Kromschroeder"; manufacturers[0x60] = "Eberle"; manufacturers[0x65] = "EBV"; - manufacturers[0x75] = "Grässlin"; + manufacturers[0x75] = "Graesslin"; manufacturers[0x85] = "ebm-papst"; manufacturers[0x95] = "SIG"; manufacturers[0xa5] = "Theben"; From 125328f7c1d0e51948973fe30ed208cdb6876464 Mon Sep 17 00:00:00 2001 From: john30 Date: Sat, 26 Dec 2015 11:34:47 +0100 Subject: [PATCH 2/2] use numeric value as fallback for ValueListDataField with unknown value association --- src/lib/ebus/data.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/lib/ebus/data.cpp b/src/lib/ebus/data.cpp index 8a1ada7a..515a223e 100644 --- a/src/lib/ebus/data.cpp +++ b/src/lib/ebus/data.cpp @@ -1232,7 +1232,9 @@ result_t ValueListDataField::readSymbols(SymbolString& input, const unsigned cha map::iterator it = m_values.find(value); if (it == m_values.end() && value != m_dataType.replacement) { - return RESULT_ERR_NOTFOUND; // value assignment not found + // fall back to raw value in input + output << setw(0) << dec << static_cast(value); + return RESULT_OK; } if (it == m_values.end()) { if (outputFormat & OF_JSON)