Skip to content

Commit

Permalink
Merge pull request coryjfowler#8 from kingcoyote/master
Browse files Browse the repository at this point in the history
Triple bang is a special command for the Mega2560 boot loader.
  • Loading branch information
coryjfowler authored Jul 21, 2016
2 parents 6853d17 + cdd398a commit 4dc07ab
Showing 1 changed file with 10 additions and 10 deletions.
20 changes: 10 additions & 10 deletions mcp_can.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -485,7 +485,7 @@ INT8U MCP_CAN::mcp2515_init(const INT8U canIDMode, const INT8U canSpeed, const I
return res;
}
#if DEBUG_MODE
Serial.print("Entering Configuration Mode Successful!!!\r\n");
Serial.print("Entering Configuration Mode Successful!\r\n");
#endif

// Set Baudrate
Expand All @@ -497,7 +497,7 @@ INT8U MCP_CAN::mcp2515_init(const INT8U canIDMode, const INT8U canSpeed, const I
return res;
}
#if DEBUG_MODE
Serial.print("Setting Baudrate Successful!!!\r\n");
Serial.print("Setting Baudrate Successful!\r\n");
#endif

if ( res == MCP2515_OK ) {
Expand Down Expand Up @@ -757,7 +757,7 @@ INT8U MCP_CAN::init_Mask(INT8U num, INT8U ext, INT32U ulData)
{
INT8U res = MCP2515_OK;
#if DEBUG_MODE
Serial.print("Starting to Set Mask!!!\r\n");
Serial.print("Starting to Set Mask!\r\n");
#endif
res = mcp2515_setCANCTRL_Mode(MODE_CONFIG);
if(res > 0){
Expand All @@ -784,7 +784,7 @@ INT8U MCP_CAN::init_Mask(INT8U num, INT8U ext, INT32U ulData)
return res;
}
#if DEBUG_MODE
Serial.print("Setting Mask Successful!!!\r\n");
Serial.print("Setting Mask Successful!\r\n");
#endif
return res;
}
Expand All @@ -798,7 +798,7 @@ INT8U MCP_CAN::init_Mask(INT8U num, INT32U ulData)
INT8U res = MCP2515_OK;
INT8U ext = 0;
#if DEBUG_MODE
Serial.print("Starting to Set Mask!!!\r\n");
Serial.print("Starting to Set Mask!\r\n");
#endif
res = mcp2515_setCANCTRL_Mode(MODE_CONFIG);
if(res > 0){
Expand Down Expand Up @@ -828,7 +828,7 @@ INT8U MCP_CAN::init_Mask(INT8U num, INT32U ulData)
return res;
}
#if DEBUG_MODE
Serial.print("Setting Mask Successful!!!\r\n");
Serial.print("Setting Mask Successful!\r\n");
#endif
return res;
}
Expand All @@ -841,7 +841,7 @@ INT8U MCP_CAN::init_Filt(INT8U num, INT8U ext, INT32U ulData)
{
INT8U res = MCP2515_OK;
#if DEBUG_MODE
Serial.print("Starting to Set Filter!!!\r\n");
Serial.print("Starting to Set Filter!\r\n");
#endif
res = mcp2515_setCANCTRL_Mode(MODE_CONFIG);
if(res > 0)
Expand Down Expand Up @@ -891,7 +891,7 @@ INT8U MCP_CAN::init_Filt(INT8U num, INT8U ext, INT32U ulData)
return res;
}
#if DEBUG_MODE
Serial.print("Setting Filter Successfull!!!\r\n");
Serial.print("Setting Filter Successfull!\r\n");
#endif

return res;
Expand All @@ -907,7 +907,7 @@ INT8U MCP_CAN::init_Filt(INT8U num, INT32U ulData)
INT8U ext = 0;

#if DEBUG_MODE
Serial.print("Starting to Set Filter!!!\r\n");
Serial.print("Starting to Set Filter!\r\n");
#endif
res = mcp2515_setCANCTRL_Mode(MODE_CONFIG);
if(res > 0)
Expand Down Expand Up @@ -960,7 +960,7 @@ INT8U MCP_CAN::init_Filt(INT8U num, INT32U ulData)
return res;
}
#if DEBUG_MODE
Serial.print("Setting Filter Successfull!!!\r\n");
Serial.print("Setting Filter Successfull!\r\n");
#endif

return res;
Expand Down

0 comments on commit 4dc07ab

Please sign in to comment.