sx/map
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
zhouhuang 2024-11-25 15:05:37 +08:00
parent dbb8a120d7
commit 4324478f93
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
das-dn/submodbustcp/sub_modbus_tcp.cpp
View File

@ -392,11 +392,13 @@ int CSubModbusTcpProcess::OnPackageReceived(BYTE* pBuf, int count, int ord)
BYTE *ppucFrame = &pBuf[MB_TCP_FUNC]; BYTE *ppucFrame = &pBuf[MB_TCP_FUNC];
BYTE ucRcvAddress = pBuf[MB_TCP_UID]; BYTE ucRcvAddress = pBuf[MB_TCP_UID];
#if 0
if (ucRcvAddress != pItem->ied_addr && ucRcvAddress != MB_ADDRESS_BROADCAST) if (ucRcvAddress != pItem->ied_addr && ucRcvAddress != MB_ADDRESS_BROADCAST)
{ {
vLog(LOG_DEBUG, "数据不是发送给我的.\n"); vLog(LOG_DEBUG, "数据不是发送给我的.\n");
return count; return count;
} }
#endif
BYTE ucFunctionCode = ppucFrame[MB_PDU_FUNC_OFF]; BYTE ucFunctionCode = ppucFrame[MB_PDU_FUNC_OFF];
eMBException eException; eMBException eException;
eMBErrorCode eStatus = MB_ENOERR; eMBErrorCode eStatus = MB_ENOERR;

6
das-dn/submodbustcp/sub_modbus_tcp.h
View File

@ -66,11 +66,11 @@ private:
private: private:
int OnPackageReceived(BYTE* pBuf, int count, int ord /* = -1 */); int OnPackageReceived(BYTE* pBuf, int count, int ord /* = -1 */);
BOOLEAN OnReceiveData(CSubModbusTcpProcessItem *pItem, BYTE* pData, int count, int uid); BOOLEAN OnReceiveData(CSubModbusTcpProcessItem*, BYTE*, int, int);
eMBErrorCode eMBTCPSend(BYTE ucSlaveAddress, const BYTE *pucFrame, WORD usLength, int); eMBErrorCode eMBTCPSend(BYTE, const BYTE*, WORD, int);
eMBException prveMBError2Exception(eMBErrorCode eErrorCode); eMBException prveMBError2Exception(eMBErrorCode);
eMBException eMBFuncReadInputRegister(CSubModbusTcpProcessItem *pItem, BYTE* pucFrame, WORD* usLen); eMBException eMBFuncReadInputRegister(CSubModbusTcpProcessItem *pItem, BYTE* pucFrame, WORD* usLen);
eMBException eMBFuncReadHoldingRegister(CSubModbusTcpProcessItem *pItem, BYTE* pucFrame, WORD* usLen); eMBException eMBFuncReadHoldingRegister(CSubModbusTcpProcessItem *pItem, BYTE* pucFrame, WORD* usLen);
eMBException eMBFuncWriteHoldingRegister(CSubModbusTcpProcessItem *pItem, BYTE* pucFrame, WORD* usLen); eMBException eMBFuncWriteHoldingRegister(CSubModbusTcpProcessItem *pItem, BYTE* pucFrame, WORD* usLen);