Michel2/Seeed_Arduino_CAN
1
0
Fork 0
mirror of https://github.com/Seeed-Studio/Seeed_Arduino_CAN.git synced 2026-09-15 02:52:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Major issue in transmission code fixed; MCP library updated and supports both 16Mhz and 8Mhz CAN modules

Browse Source
This commit is contained in:
latonita
2016-04-28 18:13:13 +03:00
parent c95e5c5f67
commit 1d74aae251
6 changed files with 280 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files
can-232.cpp
+8 -3
View File
@@ -60,6 +60,11 @@ void Can232::init(INT8U defaultCanSpeed) {
instance()->lw232CanSpeedSelection = defaultCanSpeed;
}
void Can232::init(INT8U defaultCanSpeed, const INT8U clock) {
init(defaultCanSpeed);
instance()->lw232McpModuleClock = clock;
}
void Can232::setFilter(INT8U (*userFunc)(INT32U)) {
instance()->setFilterFunc(userFunc);
}
@@ -203,7 +208,7 @@ INT8U Can232::parseAndRunCommand() {
parseCanStdId();
lw232PacketLen = HexHelper::parseNibbleWithLimit(lw232Message[LW232_OFFSET_STD_PKT_LEN], LW232_FRAME_MAX_LENGTH);
for (; idx < lw232PacketLen; idx++) {
lw232Buffer[idx] = HexHelper::parseFullByte(lw232Message[LW232_OFFSET_STD_PKT_DATA + idx * 2 + 1], lw232Message[LW232_OFFSET_STD_PKT_DATA + idx * 2 + 1]);
lw232Buffer[idx] = HexHelper::parseFullByte(lw232Message[LW232_OFFSET_STD_PKT_DATA + idx * 2], lw232Message[LW232_OFFSET_STD_PKT_DATA + idx * 2 + 1]);
}
if (CAN_OK != sendMsgBuf(lw232CanId, 0, 0, lw232PacketLen, lw232Buffer)) {
ret = LW232_ERR;
@@ -222,7 +227,7 @@ INT8U Can232::parseAndRunCommand() {
parseCanExtId();
lw232PacketLen = HexHelper::parseNibbleWithLimit(lw232Message[LW232_OFFSET_EXT_PKT_LEN], LW232_FRAME_MAX_LENGTH);
for (; idx < lw232PacketLen; idx++) {
lw232Buffer[idx] = HexHelper::parseFullByte(lw232Message[LW232_OFFSET_EXT_PKT_DATA + idx * 2 + 1], lw232Message[LW232_OFFSET_EXT_PKT_DATA + idx * 2 + 1]);
lw232Buffer[idx] = HexHelper::parseFullByte(lw232Message[LW232_OFFSET_EXT_PKT_DATA + idx * 2], lw232Message[LW232_OFFSET_EXT_PKT_DATA + idx * 2 + 1]);
}
if (CAN_OK != sendMsgBuf(lw232CanId, 1, 0, lw232PacketLen, lw232Buffer)) {
ret = LW232_ERR;
@@ -462,7 +467,7 @@ INT8U Can232::checkPassFilter(INT32U addr) {
INT8U Can232::openCanBus() {
INT8U ret = LW232_OK;
#ifndef _MCP_FAKE_MODE_
if (CAN_OK != lw232CAN.begin(lw232CanSpeedSelection))
if (CAN_OK != lw232CAN.begin(lw232CanSpeedSelection, lw232McpModuleClock))
ret = LW232_ERR;
#endif
return ret;