- Timestamp:
- Apr 1, 2016, 10:33:32 AM (8 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
rtos_arduino/trunk/arduino_lib/libraries/NcesCan/mcp_can.cpp
r195 r205 874 874 INT8U MCP_CAN::checkReceive(INT8U rxbid) 875 875 { 876 INT8U res = CAN_NOMSG;876 INT8U stat, res = CAN_NOMSG; 877 877 CHECK_RXBID(rxbid); 878 878 879 879 ENTER_CRITICAL; 880 res= mcp2515_readStatus(); /* RXnIF in Bit 1 and 0 */880 stat = mcp2515_readStatus(); /* RXnIF in Bit 1 and 0 */ 881 881 if (rxbid == 0) { 882 if ( ( res& MCP_STAT_RX0IF) == MCP_STAT_RX0IF) {882 if ( (stat & MCP_STAT_RX0IF) == MCP_STAT_RX0IF) { 883 883 res = CAN_MSGAVAIL; 884 884 } 885 885 } 886 886 else if (rxbid == 1) { 887 if ( ( res& MCP_STAT_RX1IF) == MCP_STAT_RX1IF ) {887 if ( (stat & MCP_STAT_RX1IF) == MCP_STAT_RX1IF ) { 888 888 res = CAN_MSGAVAIL; 889 } 889 } 890 890 } 891 891 LEAVE_CRITICAL; … … 900 900 INT8U MCP_CAN::checkSend(INT8U txbid) 901 901 { 902 INT8U res = CAN_NOSENDWAIT;902 INT8U stat, res = CAN_NOSENDWAIT; 903 903 INT8U txbx_ctrl[MCP_N_TXBUFFERS] = { MCP_TXB0CTRL, MCP_TXB1CTRL, MCP_TXB2CTRL }; 904 904 … … 906 906 907 907 ENTER_CRITICAL; 908 res= mcp2515_readRegister(txbx_ctrl[txbid]);909 910 if ( ( res& MCP_TXB_TXREQ_M) == MCP_TXB_TXREQ_M) {908 stat = mcp2515_readRegister(txbx_ctrl[txbid]); 909 910 if ( (stat & MCP_TXB_TXREQ_M) == MCP_TXB_TXREQ_M) { 911 911 res = CAN_SENDWAIT; 912 912 } 913 913 LEAVE_CRITICAL; 914 914 915 return CAN_NOSENDWAIT;915 return res; 916 916 } 917 917
Note:
See TracChangeset
for help on using the changeset viewer.