Skip to content

- Added flag to receive packets with invalid CRC as well #301

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

- Added flag to receive packets with invalid CRC as well #301

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions src/Modbus.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,16 +173,22 @@ class Modbus {
struct frame_arg_t {
bool to_server;
union {
uint8_t slaveId;
// For RTU
struct {
uint8_t slaveId;
bool validFrame;
};
// For TCP
struct {
uint8_t unitId;
uint32_t ipaddr;
uint16_t transactionId;
};
};
frame_arg_t(uint8_t s, bool m = false) {
slaveId = s;
to_server = m;
frame_arg_t(uint8_t _slaveId, bool _to_server = false, bool _validFrame = true) {
slaveId = _slaveId;
to_server = _to_server;
validFrame = _validFrame;
};
frame_arg_t(uint8_t u, uint32_t a, uint16_t t, bool m = false) {
unitId = u;
Expand Down
18 changes: 12 additions & 6 deletions src/ModbusRTU.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,13 +269,14 @@ void ModbusRTUTemplate::task() {
//_port->readBytes(_frame, _len);
uint16_t frameCrc = ((_frame[_len - 2] << 8) | _frame[_len - 1]); // Last two byts = crc
_len = _len - 2; // Decrease by CRC 2 bytes
if (frameCrc != crc16(address, _frame, _len)) { // CRC Check
goto cleanup;
}
bool crcError = frameCrc != crc16(address, _frame, _len);
valid_frame = valid_frame && !crcError;
_reply = EX_PASSTHROUGH;
if (_cbRaw) {
frame_arg_t header_data = { address, !isMaster };
_reply = _cbRaw(_frame, _len, (void*)&header_data);
if (!crcError || _cbRawIncludeCrcErrors) {
frame_arg_t header_data = { address, !isMaster, valid_frame };
_reply = _cbRaw(_frame, _len, (void*)&header_data);
}
}
if (!valid_frame && _reply != EX_FORCE_PROCESS) {
goto cleanup;
Expand Down Expand Up @@ -326,4 +327,9 @@ bool ModbusRTUTemplate::cleanup() {
return true;
}
return false;
}
}

bool ModbusRTUTemplate::onRaw(cbRaw cb, bool includeCrcErrors) {
_cbRawIncludeCrcErrors = includeCrcErrors;
return Modbus::onRaw(cb);
}
3 changes: 3 additions & 0 deletions src/ModbusRTU.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ class ModbusRTUTemplate : public Modbus {
TAddress _sentReg = COIL(0);
uint16_t maxRegs = MODBUS_MAX_WORDS;
uint8_t address = 0;
bool _cbRawIncludeCrcErrors = false;

uint16_t send(uint8_t slaveId, TAddress startreg, cbTransaction cb, uint8_t unit = MODBUSIP_UNIT, uint8_t* data = nullptr, bool waitResponse = true);
// Prepare and send ModbusRTU frame. _frame buffer and _len should be filled with Modbus data
Expand Down Expand Up @@ -61,6 +62,8 @@ class ModbusRTUTemplate : public Modbus {
uint8_t server() { return _slaveId; }
inline uint8_t slave() { return server(); }
uint32_t eventSource() override {return address;}
// Overload
bool onRaw(cbRaw cb = nullptr, bool includeCrcErrors = false);
};

template <class T>
Expand Down