Jonny007-MKD/Bachelorthesis
1
0
Fork 0
Code Pull requests Releases Activity

Notify with MbInfo of received data

Browse source
This commit is contained in:
Jonny007-MKD 2014-06-16 07:24:08 +00:00
parent 4e40928ff9
commit 7716a32185
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
Modbus-DLL/include/CAPL/include/ModbusClientCommon.cin
View file

@ -81,7 +81,7 @@ void OnModbusReceiveBits(struct ModbusApHeader mbap, byte buffer[])
memcpy_n2h(mbres, buffer); memcpy_n2h(mbres, buffer);
memcpy_n2h(mbreq, gQueueAck[mbap.TxID].Buffer); memcpy_n2h(mbreq, gQueueAck[mbap.TxID].Buffer);
writeDbg(MbDebug, "Received %d bits from 0x%04X", mbreq.Count, mbreq.Address); writeDbg(MbInfo, "Received %d bits from 0x%04X", mbreq.Count, mbreq.Address);
for (i = 0; i < mbres.ByteCount; i++) for (i = 0; i < mbres.ByteCount; i++)
{ {
@ -132,7 +132,7 @@ void OnModbusReceiveRegisters(struct ModbusApHeader mbap, byte buffer[])
memcpy_n2h(mbres, buffer); memcpy_n2h(mbres, buffer);
memcpy_n2h(mbreq, gQueueAck[mbap.TxID].Buffer); memcpy_n2h(mbreq, gQueueAck[mbap.TxID].Buffer);
writeDbg(MbDebug, "Received %d registers from 0x%04X", mbreq.Count, mbreq.Address); writeDbg(MbInfo, "Received %d registers from 0x%04X", mbreq.Count, mbreq.Address);
OnModbusReadRegistersSuccess(mbres, mbreq); OnModbusReadRegistersSuccess(mbres, mbreq);
} }
@ -176,7 +176,7 @@ void OnModbusConfirmBit(struct ModbusApHeader mbap, byte buffer[])
memcpy_n2h(mbc, buffer); memcpy_n2h(mbc, buffer);
writeDbg(MbDebug, "Set bit at 0x%04X to %d", mbc.Address, mbc.Value); writeDbg(MbInfo, "Set bit at 0x%04X to %d", mbc.Address, mbc.Value);
OnModbusWriteBitSuccess(mbc); OnModbusWriteBitSuccess(mbc);
} }
@ -217,7 +217,7 @@ void OnModbusConfirmRegister(struct ModbusApHeader mbap, byte buffer[])
memcpy_n2h(mbc, buffer); memcpy_n2h(mbc, buffer);
writeDbg(MbDebug, "Set register at 0x%04X to %d", mbc.Address, mbc.Value); writeDbg(MbInfo, "Set register at 0x%04X to %d", mbc.Address, mbc.Value);
OnModbusWriteRegisterSuccess(mbc); OnModbusWriteRegisterSuccess(mbc);
} }
@ -307,7 +307,7 @@ void OnModbusConfirmBits(struct ModbusApHeader mbap, byte buffer[])
memcpy_n2h(mbc, buffer); memcpy_n2h(mbc, buffer);
writeDbg(MbDebug, "Updated &d bits at 0x%04X", mbc.Count, mbc.Address); writeDbg(MbInfo, "Updated &d bits at 0x%04X", mbc.Count, mbc.Address);
OnModbusWriteBitsSuccess(mbc); OnModbusWriteBitsSuccess(mbc);
} }
@ -357,7 +357,7 @@ void OnModbusConfirmRegisters(struct ModbusApHeader mbap, byte buffer[])
memcpy_n2h(mbc, buffer); memcpy_n2h(mbc, buffer);
writeDbg(MbDebug, "Updated &d registers at 0x%04X", mbc.Count, mbc.Address); writeDbg(MbInfo, "Updated %d registers at 0x%04X", mbc.Count, mbc.Address);
OnModbusWriteRegistersSuccess(mbc); OnModbusWriteRegistersSuccess(mbc);
} }
@ -398,7 +398,7 @@ void OnModbusConfirmMasks(struct ModbusApHeader mbap, byte buffer[])
memcpy_n2h(mbc, buffer); memcpy_n2h(mbc, buffer);
writeDbg(MbDebug, "Applied masks at 0x%04X", mbc.Address); writeDbg(MbInfo, "Applied masks at 0x%04X", mbc.Address);
OnModbusWriteMasksSuccess(mbc); OnModbusWriteMasksSuccess(mbc);
} }
@ -451,7 +451,7 @@ void OnModbusReceiveConfirmRegisters(struct ModbusApHeader mbap, byte buffer[])
memcpy_n2h(mbres, buffer); memcpy_n2h(mbres, buffer);
memcpy_n2h(mbreq, gQueueAck[mbap.TxID].Buffer); memcpy_n2h(mbreq, gQueueAck[mbap.TxID].Buffer);
writeDbg(MbDebug, "Wrote some registers and received %d registers from 0x%04X", mbreq.Count, mbreq.Address); writeDbg(MbInfo, "Wrote some registers and received %d registers from 0x%04X", mbreq.Count, mbreq.Address);
OnModbusReadRegistersSuccess(mbres, mbreq); OnModbusReadRegistersSuccess(mbres, mbreq);
} }