Michel2/Seeed_Arduino_CAN
1
0
Fork 0
mirror of https://github.com/Seeed-Studio/Seeed_Arduino_CAN.git synced 2026-07-27 19:55:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #23 from igough/master

Browse Source 
Cleanup on setMsg
This commit is contained in:
Lowaichung
2016-01-20 10:09:39 +08:00
parent e960b8a5d8 20bdfae8ee
commit be30db8994
1 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mcp_can.cpp
+3 -12
View File
@@ -721,12 +721,11 @@ INT8U MCP_CAN::init_Filt(INT8U num, INT8U ext, INT32U ulData)
*********************************************************************************************************/
INT8U MCP_CAN::setMsg(INT32U id, INT8U ext, INT8U len, INT8U rtr, INT8U *pData)
{
int i = 0;
m_nExtFlg = ext;
m_nID = id;
m_nDlc = len;
m_nDlc = min( len, MAX_CHAR_IN_MESSAGE );
m_nRtr = rtr;
for(i = 0; i<MAX_CHAR_IN_MESSAGE; i++)
for(int i = 0; i<m_nDlc; i++)
{
m_nDta[i] = *(pData+i);
}
@@ -740,15 +739,7 @@ INT8U MCP_CAN::setMsg(INT32U id, INT8U ext, INT8U len, INT8U rtr, INT8U *pData)
*********************************************************************************************************/
INT8U MCP_CAN::setMsg(INT32U id, INT8U ext, INT8U len, INT8U *pData)
{
int i = 0;
m_nExtFlg = ext;
m_nID = id;
m_nDlc = len;
for(i = 0; i<MAX_CHAR_IN_MESSAGE; i++)
{
m_nDta[i] = *(pData+i);
}
return MCP2515_OK;
return setMsg( id, ext, len, 0, pData );
}
/*********************************************************************************************************