dani/CommandStation-EX
1
0
Fork 0
mirror of https://github.com/DCC-EX/CommandStation-EX.git synced 2024-12-25 05:31:24 +01:00
Code Releases Activity

Diag message fix

Browse Source
This commit is contained in:
travis-farmer 2024-11-24 05:33:10 -05:00
parent 56a68fd9af
commit e01de49d36
No known key found for this signature in database
GPG Key ID: 0BC296791D14CB35
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
IO_Modbus.cpp
View File

@ -522,8 +522,8 @@ void Modbus::_loop(unsigned long currentMicros) {
// If we're between read/write cycles then don't do anything else. // If we're between read/write cycles then don't do anything else.
if (_currentMicros - _cycleStartTime < _cycleTime) return; if (_currentMicros - _cycleStartTime < _cycleTime) return;
// ... otherwise start processing the first node in the list // ... otherwise start processing the first node in the list
DIAG(F("Modbusnode: 138 _nodeListEnd:%d "), _nodeListEnd); DIAG(F("Modbusnode: End _nodeListEnd:%d "), _nodeListEnd);
DIAG(F("Modbusnode: 139 _currentNode:%d "), _currentNode); DIAG(F("Modbusnode: Cur _currentNode:%d "), _currentNode);
_currentNode = _nodeListStart; _currentNode = _nodeListStart;
DIAG(F("Modbusnode: 141 _currentNode:%d "), _currentNode); DIAG(F("Modbusnode: 141 _currentNode:%d "), _currentNode);
_cycleStartTime = _currentMicros; _cycleStartTime = _currentMicros;
@ -532,10 +532,10 @@ void Modbus::_loop(unsigned long currentMicros) {
uint8_t error; uint8_t error;
error = modbusmaster->writeMultipleCoils(_currentNode->getNodeID(), 0, _currentNode->coils, _currentNode->getNumCoils()); error = modbusmaster->writeMultipleCoils(_currentNode->getNodeID(), 0, _currentNode->coils, _currentNode->getNumCoils());
if (error != 0) DIAG(F("%02d %04d %04d %s"), _currentNode->getNodeID(), 0, _currentNode->getNumCoils(), errorStrings[error]); if (error != 0) DIAG(F("Modbus: %02d %04d %04d %s"), _currentNode->getNodeID(), 0, _currentNode->getNumCoils(), errorStrings[error]);
error = modbusmaster->readDiscreteInputs(_currentNode->getNodeID(), 0, _currentNode->discreteInputs, _currentNode->getNumDisInputs()); error = modbusmaster->readDiscreteInputs(_currentNode->getNodeID(), 0, _currentNode->discreteInputs, _currentNode->getNumDisInputs());
if (error != 0) DIAG(F("%02d %04d %04d %s"), _currentNode->getNodeID(), 0, _currentNode->getNumDisInputs(), errorStrings[error]); if (error != 0) DIAG(F("Modbus: %02d %04d %04d %s"), _currentNode->getNodeID(), 0, _currentNode->getNumDisInputs(), errorStrings[error]);
} }
// Link to chain of CMRI bus instances // Link to chain of CMRI bus instances