Skip to content

Changed SPI speed to configurable #32

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ken551 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Changed SPI speed to configurable #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions mcp_can.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
*********************************************************************************************************/
void MCP_CAN::mcp2515_reset(void)
{
mcpSPI->beginTransaction(SPISettings(10000000, MSBFIRST, SPI_MODE0));
mcpSPI->beginTransaction(SPISettings(SPI_SPEED, MSBFIRST, SPI_MODE0));
MCP2515_SELECT();
spi_readwrite(MCP_RESET);
MCP2515_UNSELECT();
Expand All @@ -48,7 +48,7 @@ INT8U MCP_CAN::mcp2515_readRegister(const INT8U address)
{
INT8U ret;

mcpSPI->beginTransaction(SPISettings(10000000, MSBFIRST, SPI_MODE0));
mcpSPI->beginTransaction(SPISettings(SPI_SPEED, MSBFIRST, SPI_MODE0));
MCP2515_SELECT();
spi_readwrite(MCP_READ);
spi_readwrite(address);
Expand All @@ -66,7 +66,7 @@ INT8U MCP_CAN::mcp2515_readRegister(const INT8U address)
void MCP_CAN::mcp2515_readRegisterS(const INT8U address, INT8U values[], const INT8U n)
{
INT8U i;
mcpSPI->beginTransaction(SPISettings(10000000, MSBFIRST, SPI_MODE0));
mcpSPI->beginTransaction(SPISettings(SPI_SPEED, MSBFIRST, SPI_MODE0));
MCP2515_SELECT();
spi_readwrite(MCP_READ);
spi_readwrite(address);
Expand All @@ -84,7 +84,7 @@ void MCP_CAN::mcp2515_readRegisterS(const INT8U address, INT8U values[], const I
*********************************************************************************************************/
void MCP_CAN::mcp2515_setRegister(const INT8U address, const INT8U value)
{
mcpSPI->beginTransaction(SPISettings(10000000, MSBFIRST, SPI_MODE0));
mcpSPI->beginTransaction(SPISettings(SPI_SPEED, MSBFIRST, SPI_MODE0));
MCP2515_SELECT();
spi_readwrite(MCP_WRITE);
spi_readwrite(address);
Expand All @@ -100,7 +100,7 @@ void MCP_CAN::mcp2515_setRegister(const INT8U address, const INT8U value)
void MCP_CAN::mcp2515_setRegisterS(const INT8U address, const INT8U values[], const INT8U n)
{
INT8U i;
mcpSPI->beginTransaction(SPISettings(10000000, MSBFIRST, SPI_MODE0));
mcpSPI->beginTransaction(SPISettings(SPI_SPEED, MSBFIRST, SPI_MODE0));
MCP2515_SELECT();
spi_readwrite(MCP_WRITE);
spi_readwrite(address);
Expand All @@ -118,7 +118,7 @@ void MCP_CAN::mcp2515_setRegisterS(const INT8U address, const INT8U values[], co
*********************************************************************************************************/
void MCP_CAN::mcp2515_modifyRegister(const INT8U address, const INT8U mask, const INT8U data)
{
mcpSPI->beginTransaction(SPISettings(10000000, MSBFIRST, SPI_MODE0));
mcpSPI->beginTransaction(SPISettings(SPI_SPEED, MSBFIRST, SPI_MODE0));
MCP2515_SELECT();
spi_readwrite(MCP_BITMOD);
spi_readwrite(address);
Expand All @@ -135,7 +135,7 @@ void MCP_CAN::mcp2515_modifyRegister(const INT8U address, const INT8U mask, cons
INT8U MCP_CAN::mcp2515_readStatus(void)
{
INT8U i;
mcpSPI->beginTransaction(SPISettings(10000000, MSBFIRST, SPI_MODE0));
mcpSPI->beginTransaction(SPISettings(SPI_SPEED, MSBFIRST, SPI_MODE0));
MCP2515_SELECT();
spi_readwrite(MCP_READ_STATUS);
i = spi_read();
Expand Down
1 change: 1 addition & 0 deletions mcp_can.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@

#include "mcp_can_dfs.h"
#define MAX_CHAR_IN_MESSAGE 8
#define SPI_SPEED 10000000

class MCP_CAN
{
Expand Down