Diff: seeed_can_spi.cpp

Revision:

2:fd026fcfde94

Parent:

0:f5d099885d3d

--- a/seeed_can_spi.cpp	Wed Nov 06 20:16:11 2013 +0000
+++ b/seeed_can_spi.cpp	Tue Nov 12 20:54:16 2013 +0000
@@ -18,7 +18,7 @@
 
 /** reset the MCP2515
  */
-void mcpReset(can_t *obj)
+void mcpReset(mcp_can_t *obj)
 {
     obj->ncs = 0;
     obj->spi.write(MCP_RESET);
@@ -28,7 +28,7 @@
 
 /** read from a single MCP2515 register
  */
-uint8_t mcpRead(can_t *obj, const uint8_t address)
+uint8_t mcpRead(mcp_can_t *obj, const uint8_t address)
 {
     uint8_t result;
 
@@ -42,7 +42,7 @@
 
 /** read multiple MCP2515 registers sequentially into an array (relies on address auto-increment)
  */
-void mcpReadMultiple(can_t *obj, const uint8_t address, uint8_t values[], const uint8_t n)
+void mcpReadMultiple(mcp_can_t *obj, const uint8_t address, uint8_t values[], const uint8_t n)
 {
     obj->ncs = 0;
     obj->spi.write(MCP_READ);
@@ -55,7 +55,7 @@
 
 /** read the specified MCP2515 receive buffer into an array (needs one fewer SPI transfer than mcpReadMultiple)
  */
-void mcpReadBuffer(can_t *obj, const uint8_t command, uint8_t values[], const uint8_t n)
+void mcpReadBuffer(mcp_can_t *obj, const uint8_t command, uint8_t values[], const uint8_t n)
 {
     obj->ncs = 0;
     obj->spi.write(command);
@@ -67,7 +67,7 @@
 
 /**  write to a single MCP2515 register
  */
-void mcpWrite(can_t *obj, const uint8_t address, const uint8_t value)
+void mcpWrite(mcp_can_t *obj, const uint8_t address, const uint8_t value)
 {
     obj->ncs = 0;
     obj->spi.write(MCP_WRITE);
@@ -78,7 +78,7 @@
 
 /** write to multiple MCP2515 registers consecutively from an array
  */
-void mcpWriteMultiple(can_t *obj, const uint8_t address, const uint8_t values[], const uint8_t n)
+void mcpWriteMultiple(mcp_can_t *obj, const uint8_t address, const uint8_t values[], const uint8_t n)
 {
     obj->ncs = 0;
     obj->spi.write(MCP_WRITE);
@@ -91,7 +91,7 @@
 
 /** write to the specified MCP2515 transmit buffer from an array (needs one fewer SPI transfer than mcpWriteMultiple)
  */
-void mcpWriteBuffer(can_t *obj, const uint8_t command, uint8_t values[], const uint8_t n)
+void mcpWriteBuffer(mcp_can_t *obj, const uint8_t command, uint8_t values[], const uint8_t n)
 {
     obj->ncs = 0;
     obj->spi.write(command);
@@ -103,7 +103,7 @@
 
 /** initiate transmission of the specified MCP2515 transmit buffer
  */
-void mcpBufferRTS(can_t *obj, const uint8_t command)
+void mcpBufferRTS(mcp_can_t *obj, const uint8_t command)
 {
     obj->ncs = 0;
     obj->spi.write(command);
@@ -112,7 +112,7 @@
 
 /**  read mcp2515's status register
  */
-uint8_t mcpStatus(can_t *obj)
+uint8_t mcpStatus(mcp_can_t *obj)
 {
     uint8_t status;
 
@@ -125,7 +125,7 @@
 
 /**  read mcp2515's receive status register
  */
-uint8_t mcpReceiveStatus(can_t *obj)
+uint8_t mcpReceiveStatus(mcp_can_t *obj)
 {
     uint8_t status;
 
@@ -138,7 +138,7 @@
 
 /** modify bits of a register specified by a mask
  */
-void mcpBitModify(can_t *obj, const uint8_t address, const uint8_t mask, const uint8_t data)
+void mcpBitModify(mcp_can_t *obj, const uint8_t address, const uint8_t mask, const uint8_t data)
 {
     obj->ncs = 0;
     obj->spi.write(MCP_BITMOD);