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

removed pt_masterDataID again

Browse Source
This commit is contained in:
john30
2014-11-23 13:31:23 +01:00
parent aa443d1eb7
commit 6e0ddb1e8b
2 changed files with 5 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/ebus/data.cpp
+5 -14
View File
@@ -126,10 +126,7 @@ result_t DataField::create(vector<string>::iterator& it,
firstName = name; firstName = name;
firstComment = comment; firstComment = comment;
} }
if (isTemplate == false && strcasecmp(partStr, "I") == 0) { if (dstAddress == BROADCAST || isMaster(dstAddress)
partType = pt_masterDataID;
}
else if (dstAddress == BROADCAST || isMaster(dstAddress)
|| (isTemplate == false && isSetMessage == true && partStr[0] == 0) || (isTemplate == false && isSetMessage == true && partStr[0] == 0)
|| strcasecmp(partStr, "M") == 0) { // master data || strcasecmp(partStr, "M") == 0) { // master data
partType = pt_masterData; partType = pt_masterData;
@@ -334,7 +331,6 @@ result_t SingleDataField::read(SymbolString& masterData, unsigned char masterOff
switch (m_partType) switch (m_partType)
{ {
case pt_masterData: case pt_masterData:
case pt_masterDataID:
offset = 5 + masterOffset; // skip QQ ZZ PB SB NN offset = 5 + masterOffset; // skip QQ ZZ PB SB NN
break; break;
case pt_slaveData: case pt_slaveData:
@@ -376,7 +372,6 @@ result_t SingleDataField::write(istringstream& input,
switch (m_partType) switch (m_partType)
{ {
case pt_masterData: case pt_masterData:
case pt_masterDataID:
offset = 5 + masterOffset; // skip QQ ZZ PB SB NN offset = 5 + masterOffset; // skip QQ ZZ PB SB NN
break; break;
case pt_slaveData: case pt_slaveData:
@@ -955,11 +950,11 @@ result_t DataFieldSet::read(SymbolString& masterData, unsigned char masterOffset
output << m_name << "={ "; output << m_name << "={ ";
bool first = true; bool first = true;
unsigned char offsets[4]; unsigned char offsets[3];
memset(offsets, 0, sizeof(offsets)); memset(offsets, 0, sizeof(offsets));
offsets[pt_masterData] = masterOffset; offsets[pt_masterData] = masterOffset;
offsets[pt_slaveData] = slaveOffset; offsets[pt_slaveData] = slaveOffset;
bool previousFullByteOffset[] = { true, true, true, true }; bool previousFullByteOffset[] = { true, true, true };
for (vector<SingleDataField*>::iterator it = m_fields.begin(); it < m_fields.end(); it++) { for (vector<SingleDataField*>::iterator it = m_fields.begin(); it < m_fields.end(); it++) {
SingleDataField* field = *it; SingleDataField* field = *it;
bool ignored = field->isIgnored(); bool ignored = field->isIgnored();
@@ -971,8 +966,6 @@ result_t DataFieldSet::read(SymbolString& masterData, unsigned char masterOffset
else else
output << separator; output << separator;
} }
if (partType == pt_masterDataID)
partType = pt_masterData;
if (previousFullByteOffset[partType] == false && field->hasFullByteOffset(false) == false) if (previousFullByteOffset[partType] == false && field->hasFullByteOffset(false) == false)
offsets[partType]--; offsets[partType]--;
@@ -1002,18 +995,16 @@ result_t DataFieldSet::write(istringstream& input,
{ {
string token; string token;
unsigned char offsets[4]; unsigned char offsets[3];
memset(offsets, 0, sizeof(offsets)); memset(offsets, 0, sizeof(offsets));
offsets[pt_masterData] = masterOffset; offsets[pt_masterData] = masterOffset;
offsets[pt_slaveData] = slaveOffset; offsets[pt_slaveData] = slaveOffset;
bool previousFullByteOffset[] = { true, true, true, true }; bool previousFullByteOffset[] = { true, true, true };
for (vector<SingleDataField*>::iterator it = m_fields.begin(); it < m_fields.end(); it++) { for (vector<SingleDataField*>::iterator it = m_fields.begin(); it < m_fields.end(); it++) {
SingleDataField* field = *it; SingleDataField* field = *it;
bool ignored = field->isIgnored(); bool ignored = field->isIgnored();
PartType partType = field->getPartType(); PartType partType = field->getPartType();
if (partType == pt_masterDataID)
partType = pt_masterData;
if (previousFullByteOffset[partType] == false && field->hasFullByteOffset(false) == false) if (previousFullByteOffset[partType] == false && field->hasFullByteOffset(false) == false)
offsets[partType]--; offsets[partType]--;
src/lib/ebus/data.h
-1
View File
@@ -32,7 +32,6 @@ using namespace std;
enum PartType { enum PartType {
pt_any, // stored in any data (master or slave) pt_any, // stored in any data (master or slave)
pt_masterData, // stored in master data pt_masterData, // stored in master data
pt_masterDataID, // stored in master data and also used as message ID part
pt_slaveData, // stored in slave data pt_slaveData, // stored in slave data
}; };