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

add DEBUG_RAW_TRAFFIC define for debugging low level raw traffic

Browse Source
This commit is contained in:
john30
2020-04-11 13:27:51 +02:00
parent b2eed484b3
commit 165efcb25f
1 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/ebus/device.cpp
+22
View File
@@ -256,6 +256,9 @@ result_t Device::recv(unsigned int timeout, symbol_t* value, ArbitrationState* a
#endif #endif
#endif #endif
if (ret == -1) { if (ret == -1) {
#ifdef DEBUG_RAW_TRAFFIC
fprintf(stdout, "poll error %d\n", errno);
#endif
close(); close();
return RESULT_ERR_DEVICE; return RESULT_ERR_DEVICE;
} }
@@ -349,6 +352,9 @@ bool Device::available() {
for (size_t pos = 0; pos < m_bufLen; pos++) { for (size_t pos = 0; pos < m_bufLen; pos++) {
symbol_t ch = m_buffer[(pos+m_bufPos)%m_bufSize]; symbol_t ch = m_buffer[(pos+m_bufPos)%m_bufSize];
if (!(ch&ENH_BYTE_FLAG)) { if (!(ch&ENH_BYTE_FLAG)) {
#ifdef DEBUG_RAW_TRAFFIC
fprintf(stdout, "raw avail direct\n");
#endif
return true; return true;
} }
if ((ch&ENH_BYTE_MASK) == ENH_BYTE1) { if ((ch&ENH_BYTE_MASK) == ENH_BYTE1) {
@@ -358,6 +364,9 @@ bool Device::available() {
// peek into next byte to check if enhanced sequence is ok // peek into next byte to check if enhanced sequence is ok
ch = m_buffer[(pos+m_bufPos+1)%m_bufSize]; ch = m_buffer[(pos+m_bufPos+1)%m_bufSize];
if (!(ch&ENH_BYTE_FLAG) || (ch&ENH_BYTE_MASK) != ENH_BYTE2) { if (!(ch&ENH_BYTE_FLAG) || (ch&ENH_BYTE_MASK) != ENH_BYTE2) {
#ifdef DEBUG_RAW_TRAFFIC
fprintf(stdout, "raw avail enhanced following bad\n");
#endif
if (m_listener != nullptr) { if (m_listener != nullptr) {
m_listener->notifyStatus(true, "unexpected available enhanced following byte 1"); m_listener->notifyStatus(true, "unexpected available enhanced following byte 1");
} }
@@ -367,8 +376,14 @@ bool Device::available() {
pos--; pos--;
continue; continue;
} }
#ifdef DEBUG_RAW_TRAFFIC
fprintf(stdout, "raw avail enhanced\n");
#endif
return true; return true;
} }
#ifdef DEBUG_RAW_TRAFFIC
fprintf(stdout, "raw avail enhanced bad\n");
#endif
if (m_listener != nullptr) { if (m_listener != nullptr) {
m_listener->notifyStatus(true, "unexpected available enhanced byte 2"); m_listener->notifyStatus(true, "unexpected available enhanced byte 2");
} }
@@ -409,6 +424,13 @@ bool Device::read(symbol_t* value, bool isAvailable, ArbitrationState* arbitrati
if (size <= 0) { if (size <= 0) {
return false; return false;
} }
#ifdef DEBUG_RAW_TRAFFIC
fprintf(stdout, "raw <");
for (int pos=0; pos<size; pos++) {
fprintf(stdout, " %2.2x", m_buffer[m_bufLen+pos]);
}
fprintf(stdout, "\n");
#endif
m_bufLen += size; m_bufLen += size;
} }
if (!available()) { if (!available()) {