Michel2/Seeed_Arduino_CAN
1
0
Fork 0
mirror of https://github.com/Seeed-Studio/Seeed_Arduino_CAN.git synced 2026-07-28 04:06:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6 from BykeBlast/patch-1

Browse Source 
Update mcp_can.cpp
This commit is contained in:
Lowaichung
2014-09-03 10:14:20 +08:00
parent 64ca6c9c32 5c1392db30
commit 5d8d912ee3
1 changed files with 35 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mcp_can.cpp
+35 -8
View File
@@ -65,8 +65,7 @@ void MCP_CAN::mcp2515_readRegisterS(const INT8U address, INT8U values[], const I
spi_readwrite(MCP_READ);
spi_readwrite(address);
// mcp2515 has auto-increment of address-pointer
for (i=0; i<n; i++)
{
for (i=0; i<n && i<CAN_MAX_CHAR_IN_MESSAGE; i++) {
values[i] = spi_read();
}
MCP2515_UNSELECT();
@@ -761,12 +760,40 @@ INT8U MCP_CAN::readMsg()
*********************************************************************************************************/
INT8U MCP_CAN::readMsgBuf(INT8U *len, INT8U buf[])
{
readMsg();
*len = m_nDlc;
for(int i = 0; i<m_nDlc; i++)
{
buf[i] = m_nDta[i];
INT8U rc;
rc = readMsg();
if (rc == CAN_OK) {
*len = m_nDlc;
for(int i = 0; i<m_nDlc; i++) {
buf[i] = m_nDta[i];
}
} else {
*len = 0;
}
return rc;
}
/*********************************************************************************************************
** Function name: readMsgBufID
** Descriptions: read message buf and can bus source ID
*********************************************************************************************************/
INT8U MCP_CAN::readMsgBufID(INT32U *ID, INT8U *len, INT8U buf[])
{
INT8U rc;
rc = readMsg();
if (rc == CAN_OK) {
*len = m_nDlc;
*ID = m_nID;
for(int i = 0; i<m_nDlc && i < MAX_CHAR_IN_MESSAGE; i++) {
buf[i] = m_nDta[i];
}
} else {
*len = 0;
}
return rc;
}
/*********************************************************************************************************
@@ -815,4 +842,4 @@ INT32U MCP_CAN::getCanId(void)
}
/*********************************************************************************************************
END FILE
*********************************************************************************************************/
*********************************************************************************************************/