|
@@ -779,14 +779,27 @@ static void Can_Task(void* arg)
|
|
case 3:
|
|
case 3:
|
|
{
|
|
{
|
|
Can_ID = 0x031;
|
|
Can_ID = 0x031;
|
|
- for (int i = 0; i < 4; i++)
|
|
|
|
|
|
+ for (int i = 0; i < 8; i++)
|
|
{
|
|
{
|
|
Can_TxMsg.Data[i] = battbuffer[i+31+send_index*8];
|
|
Can_TxMsg.Data[i] = battbuffer[i+31+send_index*8];
|
|
}
|
|
}
|
|
- Can_TxMsg.Data[4] = 0x00;
|
|
|
|
- Can_TxMsg.Data[5] = 0x00;
|
|
|
|
- Can_TxMsg.Data[6] = 0x00;
|
|
|
|
- Can_TxMsg.Data[7] = 0x00;
|
|
|
|
|
|
+ Can_TxMsg.stdIDH = Can_ID>>3;
|
|
|
|
+ Can_TxMsg.stdIDL = Can_ID<<5;
|
|
|
|
+ Can_TxMsg.DLC = 8;
|
|
|
|
+ HAL_Can_Transmit(Can_TxMsg);
|
|
|
|
+ break;
|
|
|
|
+ }
|
|
|
|
+ case 8:
|
|
|
|
+ {
|
|
|
|
+ Can_ID = 0x041;
|
|
|
|
+ for (int i = 0; i < 2; i++)
|
|
|
|
+ {
|
|
|
|
+ Can_TxMsg.Data[i] = battbuffer[i+31+4*8];
|
|
|
|
+ }
|
|
|
|
+ for (int i = 0; i < 6; i++)
|
|
|
|
+ {
|
|
|
|
+ Can_TxMsg.Data[i+2] = 0x00;
|
|
|
|
+ }
|
|
Can_TxMsg.stdIDH = Can_ID>>3;
|
|
Can_TxMsg.stdIDH = Can_ID>>3;
|
|
Can_TxMsg.stdIDL = Can_ID<<5;
|
|
Can_TxMsg.stdIDL = Can_ID<<5;
|
|
Can_TxMsg.DLC = 8;
|
|
Can_TxMsg.DLC = 8;
|