|
@@ -84,8 +84,6 @@ void CAN_Rx_ISR(CAN_Buf_TypeDef *ptCANRx, UBYTE ucLength)
|
|
|
|
|
|
static UWORD LastPacketLen, PacketNum;
|
|
|
static ULONG OVtim;
|
|
|
-static UWORD CAN_DELYA;
|
|
|
-static UWORD MailState;
|
|
|
void CAN_SendData(UWORD ID, const UBYTE Data[], UWORD Length)
|
|
|
{
|
|
|
UBYTE i, j;
|
|
@@ -124,13 +122,13 @@ void CAN_SendData(UWORD ID, const UBYTE Data[], UWORD Length)
|
|
|
OVtim++;
|
|
|
} //等待发送结束
|
|
|
|
|
|
- MailState = (UWORD)can_transmit_states(CAN0,can_ubMbox);
|
|
|
if (OVtim >= 0XFFF)
|
|
|
{
|
|
|
return;
|
|
|
+ }
|
|
|
}
|
|
|
//发送最后一个数据包
|
|
|
- pTxMsg->tx_dlen = (UBYTE)LastPacketLen;
|
|
|
+ pTxMsg->tx_dlen = (UBYTE)LastPacketLen;
|
|
|
|
|
|
for (j = 0; j < LastPacketLen; j++)
|
|
|
{
|
|
@@ -141,18 +139,19 @@ void CAN_SendData(UWORD ID, const UBYTE Data[], UWORD Length)
|
|
|
OVtim = 0;
|
|
|
|
|
|
while((can_transmit_states(CAN0,can_ubMbox) != CAN_TRANSMIT_OK) && (OVtim < 0XFFF))
|
|
|
- {
|
|
|
+ {
|
|
|
OVtim++;
|
|
|
- }
|
|
|
+ }
|
|
|
|
|
|
if (OVtim >= 0XFFF)
|
|
|
- {
|
|
|
+ {
|
|
|
return;
|
|
|
- }
|
|
|
-}
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+
|
|
|
static UBYTE CanSendData[255], CanSendData_CRC_Buf[255];
|
|
|
void SendData(UWORD ID, UBYTE Mode, UWORD Command, const UBYTE *Data)
|
|
|
{
|