diff --git a/IO_RS485.cpp b/IO_RS485.cpp index f8bc4f9..a6be6a9 100644 --- a/IO_RS485.cpp +++ b/IO_RS485.cpp @@ -154,7 +154,7 @@ if (taskCnt > 0) { } } while (micros() - startMicros <= 500 && len < 256); if (crcGood(responseBuffer,sizeof(responseBuffer)-2)) { - if (!testAndStripMasterFlag(responseBuffer)) DIAG(F("Forgen 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) { } else { DIAG(F("EX-IOExpander485 Vpin %u cannot be used as a digital input pin"), (int)taskData[3]); @@ -197,7 +197,7 @@ if (taskCnt > 0) { } while (micros() - startMicros <= 500 && len < 256); if (crcGood(responseBuffer,sizeof(responseBuffer)-2)) { - if (!testAndStripMasterFlag(responseBuffer)) DIAG(F("Forgen 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) { DIAG(F("EX-IOExpander485: Vpin %u on node %d cannot be used as an analogue input pin"), (int) taskData[3], (int) taskData[0]); } @@ -236,7 +236,7 @@ if (taskCnt > 0) { } } while (micros() - startMicros <= 500 && len < 256); if (crcGood(responseBuffer,sizeof(responseBuffer)-2)) { - if (!testAndStripMasterFlag(responseBuffer)) DIAG(F("Forgen 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) { DIAG(F("EX-IOExpander485 Vpin %u cannot be used as a digital output pin"), (int)taskData[3]); } @@ -287,7 +287,7 @@ if (taskCnt > 0) { flagOK = false; _deviceState = DEVSTATE_FAILED; } else { - if (!testAndStripMasterFlag(responseBuffer)) DIAG(F("Forgen 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) { DIAG(F("EX-IOExpander485 Vpin %u cannot be used as a servo/PWM pin"), (int) taskData[3]); } @@ -328,7 +328,7 @@ if (taskCnt > 0) { DIAG(F("EX-IOExpander485 CRC error on node %d"), _currentNode->getNodeID()); flagOK = false; } - if (!testAndStripMasterFlag(_currentNode->_digitalInputStates)) DIAG(F("Forgen RS485 Device! no master flag from node %d"),_currentNode->getNodeID()); + if (!testAndStripMasterFlag(_currentNode->_digitalInputStates)) DIAG(F("Foreign RS485 Device! no master flag from node %d"),_currentNode->getNodeID()); if (!waitReceive) _refreshOperation++; _lastDigitalRead = currentMicros; _readState = RDS_DIGITAL; @@ -365,7 +365,7 @@ if (taskCnt > 0) { DIAG(F("EX-IOExpander485 CRC error on node %d"), _currentNode->getNodeID()); flagOK = false; } - if (!testAndStripMasterFlag(_currentNode->_digitalInputStates)) DIAG(F("Forgen RS485 Device! no master flag from node %d"),_currentNode->getNodeID()); + if (!testAndStripMasterFlag(_currentNode->_digitalInputStates)) DIAG(F("Foreign RS485 Device! no master flag from node %d"),_currentNode->getNodeID()); if (!waitReceive) _refreshOperation = 0; _lastAnalogueRead = currentMicros; _readState = RDS_ANALOGUE; diff --git a/IO_RS485.h b/IO_RS485.h index b21b69e..bf64afd 100644 --- a/IO_RS485.h +++ b/IO_RS485.h @@ -171,7 +171,7 @@ public: } } while (micros() - startMicros <= 500 && len < 256); if (receiveBuffer[1] == EXIOPINS && bus->crcGood(receiveBuffer,sizeof(receiveBuffer)-2)) { - if (!bus->testAndStripMasterFlag(receiveBuffer)) DIAG(F("Forgen RS485 Device! no master flag from node %d"),_nodeID); + if (!bus->testAndStripMasterFlag(receiveBuffer)) DIAG(F("Foreign RS485 Device! no master flag from node %d"),_nodeID); _numDigitalPins = receiveBuffer[1]; _numAnaloguePins = receiveBuffer[2]; @@ -242,7 +242,7 @@ public: } } while (micros() - startMicros <= 500 && len < 256); if (bus->crcGood(receiveBuffer,sizeof(receiveBuffer)-2)) { - if (!bus->testAndStripMasterFlag(receiveBuffer)) DIAG(F("Forgen RS485 Device! no master flag from node %d"),_nodeID); + if (!bus->testAndStripMasterFlag(receiveBuffer)) DIAG(F("Foreign RS485 Device! no master flag from node %d"),_nodeID); for (int i = 0; i < _numAnaloguePins; i++) { _analoguePinMap[i] = receiveBuffer[i]; } @@ -269,7 +269,7 @@ public: } } while (micros() - startMicros <= 500 && len < 256); if (bus->crcGood(versionBuffer,sizeof(versionBuffer)-2)) { - if (!bus->testAndStripMasterFlag(versionBuffer)) DIAG(F("Forgen RS485 Device! no master flag from node %d"),_nodeID); + if (!bus->testAndStripMasterFlag(versionBuffer)) DIAG(F("Foreign RS485 Device! no master flag from node %d"),_nodeID); _majorVer = versionBuffer[0]; _minorVer = versionBuffer[1]; _patchVer = versionBuffer[2];