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

simplified, fix for repeating read when first was incomplete

Browse Source
This commit is contained in:
john30
2020-02-16 10:49:17 +01:00
parent b26bd2d941
commit 5a6920afd5
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/ebus/device.cpp
+6 -7
View File
@@ -216,7 +216,6 @@ result_t Device::recv(unsigned int timeout, symbol_t* value, ArbitrationState* a
} }
bool repeat = false; bool repeat = false;
bool repeated = false; bool repeated = false;
ArbitrationState prevState = *arbitrationState;
do { do {
repeat = false; repeat = false;
bool isAvailable = available(); bool isAvailable = available();
@@ -271,6 +270,7 @@ result_t Device::recv(unsigned int timeout, symbol_t* value, ArbitrationState* a
if (!isAvailable && incomplete && !repeated) { if (!isAvailable && incomplete && !repeated) {
// for a two-byte transfer another poll is needed // for a two-byte transfer another poll is needed
repeat = true; repeat = true;
repeated = true;
timeout = ENHANCED_COMPLETE_WAIT_DURATION; timeout = ENHANCED_COMPLETE_WAIT_DURATION;
continue; continue;
} }
@@ -281,12 +281,7 @@ result_t Device::recv(unsigned int timeout, symbol_t* value, ArbitrationState* a
if (m_listener != nullptr) { if (m_listener != nullptr) {
m_listener->notifyDeviceData(*value, true); m_listener->notifyDeviceData(*value, true);
} }
if (m_enhancedProto) { if (!m_enhancedProto && m_arbitrationMaster != SYN) {
if (*arbitrationState != prevState) {
m_arbitrationMaster = SYN;
m_arbitrationCheck = false;
}
} else if (m_arbitrationMaster != SYN) {
if (m_arbitrationCheck) { if (m_arbitrationCheck) {
*arbitrationState = *value == m_arbitrationMaster ? as_won : as_lost; *arbitrationState = *value == m_arbitrationMaster ? as_won : as_lost;
m_arbitrationMaster = SYN; m_arbitrationMaster = SYN;
@@ -485,6 +480,8 @@ bool Device::read(symbol_t* value, bool isAvailable, ArbitrationState* arbitrati
case ENH_RES_RESETTED: case ENH_RES_RESETTED:
if (*arbitrationState != as_none) { if (*arbitrationState != as_none) {
*arbitrationState = as_error; *arbitrationState = as_error;
m_arbitrationMaster = SYN;
m_arbitrationCheck = false;
} }
// TODO define additional feature flags // TODO define additional feature flags
if (m_listener != nullptr) { if (m_listener != nullptr) {
@@ -512,6 +509,8 @@ bool Device::read(symbol_t* value, bool isAvailable, ArbitrationState* arbitrati
} }
if (*arbitrationState != as_none) { if (*arbitrationState != as_none) {
*arbitrationState = as_error; *arbitrationState = as_error;
m_arbitrationMaster = SYN;
m_arbitrationCheck = false;
} }
break; break;
default: default: