1
0
mirror of https://github.com/DCC-EX/CommandStation-EX.git synced 2025-04-21 12:31:19 +02:00

rename branch, remove possible blockers

This commit is contained in:
travis-farmer 2024-12-13 09:04:12 -05:00
parent 428796fa9c
commit 577511f92f
No known key found for this signature in database
GPG Key ID: 0BC296791D14CB35

View File

@ -285,7 +285,7 @@ if (taskCnt > 0) {
if (!crcGood(responseBuffer,sizeof(responseBuffer)-2)) { if (!crcGood(responseBuffer,sizeof(responseBuffer)-2)) {
DIAG(F("EX-IOExpander485 node %d CRC Error"), (int) taskData[0]); DIAG(F("EX-IOExpander485 node %d CRC Error"), (int) taskData[0]);
flagOK = false; flagOK = false;
_deviceState = DEVSTATE_FAILED; //_deviceState = DEVSTATE_FAILED;
} else { } else {
if (!testAndStripMasterFlag(responseBuffer)) DIAG(F("Foreign RS485 Device! no master flag from node %d"),_currentNode->getNodeID()); if (!testAndStripMasterFlag(responseBuffer)) DIAG(F("Foreign RS485 Device! no master flag from node %d"),_currentNode->getNodeID());
if (responseBuffer[0] != EXIORDY) { if (responseBuffer[0] != EXIORDY) {
@ -372,7 +372,7 @@ if (taskCnt > 0) {
} }
break; break;
} }
if(flagOK == true) _currentNode = _currentNode->getNext(); if(flagOK && !waitReceive) _currentNode = _currentNode->getNext();
} }
#if defined(RS485_STM_OK) #if defined(RS485_STM_OK)