Merge pull request autowp#34 from jxltom/jxltom-patch-1

jxltom · web-flow · commit 2c3eb40d8e7b · 2020-03-24T18:12:06.000+08:00
More appropriate return code for sendMessage method
diff --git a/mcp2515.cpp b/mcp2515.cpp
@@ -599,6 +599,10 @@ MCP2515::ERROR MCP2515::sendMessage(const TXBn txbn, const struct can_frame *fra
 
     modifyRegister(txbuf->CTRL, TXB_TXREQ, TXB_TXREQ);
 
+    uint8_t ctrl = readRegister(txbuf->CTRL);
+    if ((ctrl & (TXB_ABTF | TXB_MLOA | TXB_TXERR)) != 0) {
+        return ERROR_FAILTX;
+    }
     return ERROR_OK;
 }
 
@@ -618,7 +622,7 @@ MCP2515::ERROR MCP2515::sendMessage(const struct can_frame *frame)
         }
     }
 
-    return ERROR_FAILTX;
+    return ERROR_ALLTXBUSY;
 }
 
 MCP2515::ERROR MCP2515::readMessage(const RXBn rxbn, struct can_frame *frame)

Original file line number	Diff line number	Diff line change
`@@ -599,6 +599,10 @@ MCP2515::ERROR MCP2515::sendMessage(const TXBn txbn, const struct can_frame *fra`
`599`	`599`
`600`	`600`	`modifyRegister(txbuf->CTRL, TXB_TXREQ, TXB_TXREQ);`
`601`	`601`
	`602`	`+ uint8_t ctrl = readRegister(txbuf->CTRL);`
	`603`	`+ if ((ctrl & (TXB_ABTF \| TXB_MLOA \| TXB_TXERR)) != 0) {`
	`604`	`+ return ERROR_FAILTX;`
	`605`	`+ }`
`602`	`606`	`return ERROR_OK;`
`603`	`607`	`}`
`604`	`608`
`@@ -618,7 +622,7 @@ MCP2515::ERROR MCP2515::sendMessage(const struct can_frame *frame)`
`618`	`622`	`}`
`619`	`623`	`}`
`620`	`624`
`621`		`- return ERROR_FAILTX;`
	`625`	`+ return ERROR_ALLTXBUSY;`
`622`	`626`	`}`
`623`	`627`
`624`	`628`	`MCP2515::ERROR MCP2515::readMessage(const RXBn rxbn, struct can_frame *frame)`