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-12-26 11:39:24 +01:00
parent 0583d88969 125328f7c1
commit de0925897b
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/ebus/data.cpp
+5 -3
View File
@@ -1232,7 +1232,9 @@ result_t ValueListDataField::readSymbols(SymbolString& input, const unsigned cha
map<unsigned int, string>::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<int>(value);
return RESULT_OK;
}
if (it == m_values.end()) {
if (outputFormat & OF_JSON)
@@ -1294,10 +1296,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";