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

some type fixes

Browse Source
This commit is contained in:
travis-farmer 2024-11-27 04:57:47 -05:00
parent 83130f0c4a
commit 5a4b87846c
No known key found for this signature in database
GPG Key ID: 0BC296791D14CB35
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
IO_Modbus.cpp
View File

@ -206,11 +206,11 @@ void ModbusRTUComm::begin(unsigned long baud, uint32_t config) {
#endif #endif
if (_dePin >= 0) { if (_dePin >= 0) {
pinMode(_dePin, OUTPUT); pinMode(_dePin, OUTPUT);
ArduinoPins::fastWriteDigital(_dePin, LOW); digitalWrite(_dePin, LOW);
} }
if (_rePin >= 0) { if (_rePin >= 0) {
pinMode(_rePin, OUTPUT); pinMode(_rePin, OUTPUT);
ArduinoPins::fastWriteDigital(_rePin, LOW); digitalWrite(_rePin, LOW);
} }
clearRxBuffer(); clearRxBuffer();
} }
@ -249,13 +249,13 @@ ModbusRTUCommError ModbusRTUComm::readAdu(ModbusADU& adu) {
void ModbusRTUComm::writeAdu(ModbusADU& adu) { void ModbusRTUComm::writeAdu(ModbusADU& adu) {
adu.updateCrc(); adu.updateCrc();
if (_dePin >= 0) ArduinoPins::fastWriteDigital(_dePin, HIGH); if (_dePin >= 0) digitalWrite(_dePin, HIGH);
if (_rePin >= 0) ArduinoPins::fastWriteDigital(_rePin, HIGH); if (_rePin >= 0) digitalWrite(_rePin, HIGH);
_serial.write(adu.rtu, adu.getRtuLen()); _serial.write(adu.rtu, adu.getRtuLen());
_serial.flush(); _serial.flush();
///delayMicroseconds(_postDelay); ///delayMicroseconds(_postDelay);
if (_dePin >= 0) ArduinoPins::fastWriteDigital(_dePin, LOW); if (_dePin >= 0) digitalWrite(_dePin, LOW);
if (_rePin >= 0) ArduinoPins::fastWriteDigital(_rePin, LOW); if (_rePin >= 0) digitalWrite(_rePin, LOW);
} }
void ModbusRTUComm::clearRxBuffer() { void ModbusRTUComm::clearRxBuffer() {
@ -323,7 +323,7 @@ ModbusRTUMasterError ModbusRTUMaster::writeMultipleCoils(uint8_t id, uint16_t st
adu.setDataRegister(2, quantity); adu.setDataRegister(2, quantity);
adu.data[4] = byteCount; adu.data[4] = byteCount;
for (uint16_t i = 0; i < quantity; i++) { for (uint16_t i = 0; i < quantity; i++) {
bitWrite(adu.data[5 + (i >> 3)], i & 7, buf[i]); bitWrite(adu.data[5 + (i >> 3)], i & 7, (bool) buf[i]);
} }
for (uint16_t i = quantity; i < (byteCount * 8); i++) { for (uint16_t i = quantity; i < (byteCount * 8); i++) {
bitClear(adu.data[5 + (i >> 3)], i & 7); bitClear(adu.data[5 + (i >> 3)], i & 7);
@ -408,7 +408,7 @@ ModbusRTUMasterError ModbusRTUMaster::_readValues(uint8_t id, uint8_t functionCo
if (adu.getDataLen() != (1 + byteCount)) return MODBUS_RTU_MASTER_UNEXPECTED_LENGTH; if (adu.getDataLen() != (1 + byteCount)) return MODBUS_RTU_MASTER_UNEXPECTED_LENGTH;
if (adu.data[0] != byteCount) return MODBUS_RTU_MASTER_UNEXPECTED_BYTE_COUNT; if (adu.data[0] != byteCount) return MODBUS_RTU_MASTER_UNEXPECTED_BYTE_COUNT;
for (uint16_t i = 0; i < quantity; i++) { for (uint16_t i = 0; i < quantity; i++) {
buf[i] = bitRead(adu.data[1 + (i >> 3)], i & 7); buf[i] = (char) bitRead(adu.data[1 + (i >> 3)], i & 7);
} }
return MODBUS_RTU_MASTER_SUCCESS; return MODBUS_RTU_MASTER_SUCCESS;
} }
@ -531,16 +531,16 @@ void Modbus::_loop(unsigned long currentMicros) {
const char* errorStrings[16] = { "success", "invalid id", "invalid buffer", "invalid quantity", "response timeout", "frame error", "crc error", "unknown comm error", "unexpected id", "exception response", "unexpected function code", "unexpected response length", "unexpected byte count", "unexpected address", "unexpected value", "unexpected quantity" }; const char* errorStrings[16] = { "success", "invalid id", "invalid buffer", "invalid quantity", "response timeout", "frame error", "crc error", "unknown comm error", "unexpected id", "exception response", "unexpected function code", "unexpected response length", "unexpected byte count", "unexpected address", "unexpected value", "unexpected quantity" };
uint8_t error; uint8_t error;
error = _modbusmaster->writeMultipleHoldingRegisters(_currentNode->getNodeID(), 0, (uint16_t*) _currentNode->holdingRegisters, _currentNode->getNumHoldingRegisters()); //error = _modbusmaster->writeMultipleHoldingRegisters(_currentNode->getNodeID(), 0, (uint16_t*) _currentNode->holdingRegisters, _currentNode->getNumHoldingRegisters());
DIAG(F("ModbusHR: %d %d %d %s"), _currentNode->getNodeID(), 0, _currentNode->getNumHoldingRegisters(), errorStrings[error]); DIAG(F("ModbusHR: %d %d %d %s"), _currentNode->getNodeID(), 0, _currentNode->getNumHoldingRegisters(), errorStrings[error]);
error = _modbusmaster->writeMultipleCoils(_currentNode->getNodeID(), 0, (char*) _currentNode->coils, _currentNode->getNumCoils()); //error = _modbusmaster->writeMultipleCoils(_currentNode->getNodeID(), 0, (char*) _currentNode->coils, _currentNode->getNumCoils());
DIAG(F("ModbusMC: T%d F%d N%d %s"), _currentNode->getNodeID(), 0, _currentNode->getNumCoils(), errorStrings[error]); DIAG(F("ModbusMC: T%d F%d N%d %s"), _currentNode->getNodeID(), 0, _currentNode->getNumCoils(), errorStrings[error]);
error = _modbusmaster->readDiscreteInputs(_currentNode->getNodeID(), 0, (char*) _currentNode->discreteInputs, _currentNode->getNumDiscreteInputs()); error = _modbusmaster->readDiscreteInputs(_currentNode->getNodeID(), 0, (char*) _currentNode->discreteInputs, _currentNode->getNumDiscreteInputs());
DIAG(F("ModbusDI: T%d F%d N%d %s"), _currentNode->getNodeID(), 0, _currentNode->getNumDiscreteInputs(), errorStrings[error]); DIAG(F("ModbusDI: T%d F%d N%d %s"), _currentNode->getNodeID(), 0, _currentNode->getNumDiscreteInputs(), errorStrings[error]);
error = _modbusmaster->readInputRegisters(_currentNode->getNodeID(), 0, (uint16_t*) _currentNode->inputRegisters, _currentNode->getNumInputRegisters()); //error = _modbusmaster->readInputRegisters(_currentNode->getNodeID(), 0, (uint16_t*) _currentNode->inputRegisters, _currentNode->getNumInputRegisters());
DIAG(F("ModbusIR: %d %d %d %s"), _currentNode->getNodeID(), 0, _currentNode->getNumInputRegisters(), errorStrings[error]); DIAG(F("ModbusIR: %d %d %d %s"), _currentNode->getNodeID(), 0, _currentNode->getNumInputRegisters(), errorStrings[error]);
_currentNode = _currentNode->getNext(); _currentNode = _currentNode->getNext();
//delayUntil(_currentMicros + _cycleTime * 1000UL); //delayUntil(_currentMicros + _cycleTime * 1000UL);

2
IO_Modbus.h
View File

@ -240,7 +240,7 @@ public:
// Return current state from this device // Return current state from this device
uint16_t pin = vpin - _firstVpin; uint16_t pin = vpin - _firstVpin;
if (pin < _numDiscreteInputs) { if (pin < _numDiscreteInputs) {
return discreteInputs[pin]? 1:0; return (int) discreteInputs[pin];
} else } else
return 0; return 0;
} }