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

added getDayName(), formatting

Browse Source
This commit is contained in:
john30
2017-02-19 11:37:09 +01:00
parent cfe66cbf6f
commit 1fd682ba51
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/ebus/data.cpp
+9 -1
View File
@@ -264,6 +264,13 @@ void DataField::dumpString(ostream& output, const string str, const bool prepend
}
}
string DataField::getDayName(int day) {
if (day < 0 || day > 6) {
return "";
}
return dayNames[day];
}
result_t SingleDataField::create(const string id, const unsigned char length,
const string name, const string comment, const string unit,
const PartType partType, int divisor, map<unsigned int, string> values,
@@ -300,8 +307,9 @@ result_t SingleDataField::create(const string id, const unsigned char length,
if (dataType->isNumeric()) {
NumberDataType* numType = reinterpret_cast<NumberDataType*>(dataType);
if (values.empty() && numType->hasFlag(DAY)) {
for (unsigned int i = 0; i < sizeof(dayNames) / sizeof(dayNames[0]); i++)
for (unsigned int i = 0; i < sizeof(dayNames) / sizeof(dayNames[0]); i++) {
values[numType->getMinValue() + i] = dayNames[i];
}
}
result_t result = numType->derive(divisor, bitCount, numType);
if (result != RESULT_OK) {