Commit 76514bb8 authored by 何锐's avatar 何锐

feat:增加发送转速报文

parent 26b8ac48
...@@ -95,6 +95,7 @@ void Set_CAN_CRC(CAN_message * CanMessage){ ...@@ -95,6 +95,7 @@ void Set_CAN_CRC(CAN_message * CanMessage){
void Format_CAN_Msg() void Format_CAN_Msg()
{ {
CanMsg_521.ID = 0x521; CanMsg_521.ID = 0x521;
CanMsg_522.ID = 0x522;
// CanMsg_101.ID = 0x101; // CanMsg_101.ID = 0x101;
// CanMsg_067.ID = 0x67; // CanMsg_067.ID = 0x67;
// CanMsg_600.ID = 0x600; // CanMsg_600.ID = 0x600;
...@@ -121,6 +122,7 @@ void Format_CAN_Msg() ...@@ -121,6 +122,7 @@ void Format_CAN_Msg()
// CanMsg_0A40FFE2.ID = 0x0A40FFE2; // CanMsg_0A40FFE2.ID = 0x0A40FFE2;
CanMsg_521.Length = 8; CanMsg_521.Length = 8;
CanMsg_522.Length = 8;
// CanMsg_101.Length = 8; // CanMsg_101.Length = 8;
// CanMsg_067.Length = 8; // CanMsg_067.Length = 8;
// CanMsg_600.Length = 8; // CanMsg_600.Length = 8;
...@@ -148,6 +150,7 @@ void Format_CAN_Msg() ...@@ -148,6 +150,7 @@ void Format_CAN_Msg()
CanMsg_521.ID_EN = 1; CanMsg_521.ID_EN = 1;
CanMsg_522.ID_EN = 1;
// CanMsg_101.ID_EN = 1; // CanMsg_101.ID_EN = 1;
// CanMsg_067.ID_EN = 1; // CanMsg_067.ID_EN = 1;
// CanMsg_600.ID_EN = 1; // CanMsg_600.ID_EN = 1;
...@@ -231,6 +234,8 @@ void App_Can_Proc(void) ...@@ -231,6 +234,8 @@ void App_Can_Proc(void)
// Clear_CAN_Msg((CAN_message *)&CanMsg_067); // Clear_CAN_Msg((CAN_message *)&CanMsg_067);
// bReturn = Api_CANSendFrame((CAN_message *)&CanMsg_610); // bReturn = Api_CANSendFrame((CAN_message *)&CanMsg_610);
// Clear_CAN_Msg((CAN_message *)&CanMsg_610); // Clear_CAN_Msg((CAN_message *)&CanMsg_610);
bReturn = Api_CANSendFrame((CAN_message *)&CanMsg_522);
Clear_CAN_Msg((CAN_message *)&CanMsg_522);
} }
if(GetCtrlTime(CANMsgSend_50ms) >= 50){ if(GetCtrlTime(CANMsgSend_50ms) >= 50){
...@@ -351,8 +356,12 @@ void App_Can_Proc(void) ...@@ -351,8 +356,12 @@ void App_Can_Proc(void)
// CurValueStr[Vvspeed_H ].val = 0; // CurValueStr[Vvspeed_H ].val = 0;
// CurValueStr[Vvspeed_L ].val = 0; // CurValueStr[Vvspeed_L ].val = 0;
CurValueStr[Engine_water_temperature_display].val = 0; CurValueStr[Engine_water_temperature_display].val = 0;
CurValueStr[EVpeed_H].val = 0;
CurValueStr[EVpeed_L].val = 0;
CurValueStr[Engine_water_temperature_display].fval = Value_Plus; CurValueStr[Engine_water_temperature_display].fval = Value_Plus;
CurValueStr[EVpeed_H].fval = Value_Plus;
CurValueStr[EVpeed_L].fval = Value_Plus;
// CurValueStr[ENUM_VSpeed ].fval = Value_Plus; // CurValueStr[ENUM_VSpeed ].fval = Value_Plus;
// CurValueStr[ECM_FaultIndicator ].fval = Value_Plus; // CurValueStr[ECM_FaultIndicator ].fval = Value_Plus;
// CurValueStr[ECM_StautsInvalid ].fval = Value_Plus; // CurValueStr[ECM_StautsInvalid ].fval = Value_Plus;
......
...@@ -61,6 +61,8 @@ void APP_ICM_Proc(void) /*zh321*/ /*FS04*/ ...@@ -61,6 +61,8 @@ void APP_ICM_Proc(void) /*zh321*/ /*FS04*/
{ {
{ {
CurValueStr[Engine_water_temperature_display].val = 0x64; CurValueStr[Engine_water_temperature_display].val = 0x64;
CurValueStr[EVpeed_L].val = 0xE8;
CurValueStr[EVpeed_H].val = 0x03;
// CurValueStr[Vspeed ].val = 0; // CurValueStr[Vspeed ].val = 0;
// CurValueStr[hour ].val = 0; // CurValueStr[hour ].val = 0;
// CurValueStr[minute ].val = 0; // CurValueStr[minute ].val = 0;
......
...@@ -97,6 +97,8 @@ enum ...@@ -97,6 +97,8 @@ enum
// Enginefailure, //发动机故障 // Enginefailure, //发动机故障
// P_dang, // P_dang,
Engine_water_temperature_display = 0, Engine_water_temperature_display = 0,
EVpeed_H,
EVpeed_L,
CAN_List_Num, CAN_List_Num,
}; };
...@@ -169,6 +171,9 @@ static const s_CAN_List CAN_List[] = ...@@ -169,6 +171,9 @@ static const s_CAN_List CAN_List[] =
// {&CanMsg_0A20FFE2, 0, 4, 2, 0, Offset_Plus, 1, 1, &CurValueStr[P_dang ], Motorola}, // {&CanMsg_0A20FFE2, 0, 4, 2, 0, Offset_Plus, 1, 1, &CurValueStr[P_dang ], Motorola},
{&CanMsg_521, 1, 0, 8, 0, Offset_Plus, 1, 1, &CurValueStr[Engine_water_temperature_display ], Motorola}, {&CanMsg_521, 1, 0, 8, 0, Offset_Plus, 1, 1, &CurValueStr[Engine_water_temperature_display ], Motorola},
{&CanMsg_522, 4, 0, 8, 0, Offset_Plus, 1, 1, &CurValueStr[EVpeed_L ], Motorola},
{&CanMsg_522, 5, 0, 8, 0, Offset_Plus, 1, 1, &CurValueStr[EVpeed_H ], Motorola},
}; };
extern unsigned int Key_Dodging_flag; extern unsigned int Key_Dodging_flag;
extern unsigned int lost_flag; extern unsigned int lost_flag;
......
...@@ -109,6 +109,7 @@ ...@@ -109,6 +109,7 @@
/*zh:*/ /*zh:*/
/*CS08 test*/ /*CS08 test*/
EXTERN_VAR CAN_message CanMsg_521; EXTERN_VAR CAN_message CanMsg_521;
EXTERN_VAR CAN_message CanMsg_522;
// EXTERN_VAR CAN_message CanMsg_101; // EXTERN_VAR CAN_message CanMsg_101;
// EXTERN_VAR CAN_message CanMsg_067; // EXTERN_VAR CAN_message CanMsg_067;
// EXTERN_VAR CAN_message CanMsg_600; // EXTERN_VAR CAN_message CanMsg_600;
...@@ -135,6 +136,7 @@ ...@@ -135,6 +136,7 @@
// EXTERN_VAR CAN_message CanMsg_0A40FFE2; // EXTERN_VAR CAN_message CanMsg_0A40FFE2;
extern CAN_message CanMsg_521; extern CAN_message CanMsg_521;
extern CAN_message CanMsg_522;
// extern CAN_message CanMsg_101; // extern CAN_message CanMsg_101;
// extern CAN_message CanMsg_067; // extern CAN_message CanMsg_067;
// extern CAN_message CanMsg_600; // extern CAN_message CanMsg_600;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment