Skip to content

J
jiancetai
Commit e133e1fe authored by 何锐's avatar 何锐
Browse files
Options

✨ feat:EMC实验，与表同时更新指南针与发动机水温设置

parent 76514bb8
Hide whitespace changes
Inline Side-by-side
Showing with 59 additions and 18 deletions
Test_Bench/Api_Sources/APP_CAN.c
View file @ e133e1fe
......@@ -94,8 +94,10 @@ void Set_CAN_CRC(CAN_message * CanMessage){
*/
void Format_CAN_Msg()
{
CanMsg_101.ID = 0x101; //ˮ
CanMsg_521.ID = 0x521;
CanMsg_522.ID = 0x522;
CanMsg_621.ID = 0x621; //ָ
// CanMsg_101.ID = 0x101;
// CanMsg_067.ID = 0x67;
// CanMsg_600.ID = 0x600;
......@@ -121,8 +123,10 @@ void Format_CAN_Msg()
// CanMsg_0A18FFE0.ID = 0x0A18FFE0;
// CanMsg_0A40FFE2.ID = 0x0A40FFE2;
CanMsg_101.Length = 8;
CanMsg_521.Length = 8;
CanMsg_522.Length = 8;
CanMsg_621.Length = 8;
// CanMsg_101.Length = 8;
// CanMsg_067.Length = 8;
// CanMsg_600.Length = 8;
......@@ -149,8 +153,10 @@ void Format_CAN_Msg()
// CanMsg_0A40FFE2.Length = 8;
CanMsg_101.ID_EN = 1;
CanMsg_521.ID_EN = 1;
CanMsg_522.ID_EN = 1;
CanMsg_621.ID_EN = 1;
// CanMsg_101.ID_EN = 1;
// CanMsg_067.ID_EN = 1;
// CanMsg_600.ID_EN = 1;
......@@ -221,7 +227,9 @@ void App_Can_Proc(void)
if(GetCtrlTime(CANMsgSend_10ms) >= 10)
{
ClearCtrlTime(CANMsgSend_10ms);
ClearCtrlTime(CANMsgSend_10ms);
bReturn = Api_CANSendFrame((CAN_message *)&CanMsg_101);
Clear_CAN_Msg((CAN_message *)&CanMsg_101);
// bReturn = Api_CANSendFrame((CAN_message *)&CanMsg_0A30FFE8);
// Clear_CAN_Msg((CAN_message *)&CanMsg_0A30FFE8);
}
......@@ -236,6 +244,9 @@ void App_Can_Proc(void)
// Clear_CAN_Msg((CAN_message *)&CanMsg_610);
bReturn = Api_CANSendFrame((CAN_message *)&CanMsg_522);
Clear_CAN_Msg((CAN_message *)&CanMsg_522);
bReturn = Api_CANSendFrame((CAN_message *)&CanMsg_621);
Clear_CAN_Msg((CAN_message *)&CanMsg_621);
}
if(GetCtrlTime(CANMsgSend_50ms) >= 50){
......@@ -355,13 +366,17 @@ void App_Can_Proc(void)
// CurValueStr[year ].val = 0;
// CurValueStr[Vvspeed_H ].val = 0;
// CurValueStr[Vvspeed_L ].val = 0;
CurValueStr[Engine_water_temperature_display].val = 0;
CurValueStr[EVpeed_H].val = 0;
CurValueStr[EVpeed_L].val = 0;
CurValueStr[Engine_water_temperature_display_L].val = 0;
CurValueStr[Engine_water_temperature_display_H].val = 0;
CurValueStr[Engine_water_temperature_display_state].val = 0;
// CurValueStr[EVpeed_H].val = 0;
// CurValueStr[EVpeed_L].val = 0;
CurValueStr[Engine_water_temperature_display].fval = Value_Plus;
CurValueStr[EVpeed_H].fval = Value_Plus;
CurValueStr[EVpeed_L].fval = Value_Plus;
CurValueStr[Engine_water_temperature_display_L].fval = Value_Plus;
CurValueStr[Engine_water_temperature_display_H].fval = Value_Plus;
CurValueStr[Engine_water_temperature_display_state].fval = Value_Plus;
// CurValueStr[EVpeed_H].fval = Value_Plus;
// CurValueStr[EVpeed_L].fval = Value_Plus;
// CurValueStr[ENUM_VSpeed ].fval = Value_Plus;
// CurValueStr[ECM_FaultIndicator ].fval = Value_Plus;
// CurValueStr[ECM_StautsInvalid ].fval = Value_Plus;
......
Test_Bench/Api_Sources/APP_Test.c
View file @ e133e1fe
......@@ -60,9 +60,19 @@ void APP_ICM_Proc(void) /*zh321*/ /*FS04*/
//if(Self_propelled_flag==1)
{
{
CurValueStr[Engine_water_temperature_display].val = 0x64;
CurValueStr[EVpeed_L].val = 0xE8;
CurValueStr[EVpeed_H].val = 0x03;
CurValueStr[Engine_water_temperature_display_H].val = 0x0B;
CurValueStr[Engine_water_temperature_display_L].val = 0x0E;
CurValueStr[Engine_water_temperature_display_state].val = 0x00;
// CurValueStr[EVpeed_L].val = 0xE8;
// CurValueStr[EVpeed_H].val = 0x03;
CurValueStr[Compass].val = 0X01;
CurValueStr[Compass_H].val = 0X54;
CurValueStr[Compass_flag].val = 0x08;
CurValueStr[Temperature_Swtich].val = 0x01; //发动机水温
// CurValueStr[Vspeed ].val = 0;
// CurValueStr[hour ].val = 0;
// CurValueStr[minute ].val = 0;
......
Test_Bench/App_Headers/APP_Test.h
View file @ e133e1fe
......@@ -96,9 +96,15 @@ enum
// Parallelsignals, //并联信号
// Enginefailure, //发动机故障
// P_dang,
Engine_water_temperature_display = 0,
EVpeed_H,
EVpeed_L,
Engine_water_temperature_display_L = 0,
Engine_water_temperature_display_H,
Engine_water_temperature_display_state,
// EVpeed_H,
// EVpeed_L,
Compass, //指南针
Compass_H,
Compass_flag,
Temperature_Swtich, //发动机水温显示与大气温度切换
CAN_List_Num,
};
......@@ -170,10 +176,16 @@ static const s_CAN_List CAN_List[] =
// {&CanMsg_0A40FFE2, 0, 0, 8, 0, Offset_Plus, 1, 1, &CurValueStr[Enginefailure ], 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_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},
{&CanMsg_101, 5, 0, 8, 0, Offset_Plus, 1, 10, &CurValueStr[Engine_water_temperature_display_L ], Motorola},
{&CanMsg_101, 4, 0, 8, 0, Offset_Plus, 1, 10, &CurValueStr[Engine_water_temperature_display_H ], Motorola},
{&CanMsg_101, 6, 7, 1, 0, Offset_Plus, 1, 1, &CurValueStr[Engine_water_temperature_display_state ], 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},
{&CanMsg_621, 1, 0, 8, 0, Offset_Plus, 1, 1, &CurValueStr[Compass ], Motorola},
{&CanMsg_621, 2, 0, 8, 0, Offset_Plus, 1, 1, &CurValueStr[Compass_H ], Motorola},
{&CanMsg_621, 3, 0, 8, 0, Offset_Plus, 1, 1, &CurValueStr[Compass_flag ], Motorola},
{&CanMsg_621, 4, 3, 1, 0, Offset_Plus, 1, 1, &CurValueStr[Temperature_Swtich ], Intel},
};
extern unsigned int Key_Dodging_flag;
extern unsigned int lost_flag;
......
Test_Bench/App_Headers/Globals_Var.h
View file @ e133e1fe
......@@ -108,8 +108,10 @@
/*zh:*/
/*CS08 test*/
EXTERN_VAR CAN_message CanMsg_101;
EXTERN_VAR CAN_message CanMsg_521;
EXTERN_VAR CAN_message CanMsg_522;
EXTERN_VAR CAN_message CanMsg_621;
// EXTERN_VAR CAN_message CanMsg_101;
// EXTERN_VAR CAN_message CanMsg_067;
// EXTERN_VAR CAN_message CanMsg_600;
......@@ -135,8 +137,10 @@
// EXTERN_VAR CAN_message CanMsg_0A18FFE0;
// EXTERN_VAR CAN_message CanMsg_0A40FFE2;
extern CAN_message CanMsg_101;
extern CAN_message CanMsg_521;
extern CAN_message CanMsg_522;
extern CAN_message CanMsg_621;
// extern CAN_message CanMsg_101;
// extern CAN_message CanMsg_067;
// extern CAN_message CanMsg_600;
......
Test_Bench/TBDML.ini
View file @ e133e1fe
......@@ -10,7 +10,7 @@ Target=TBDML
Layout=C_layout.hwl
LoadDialogOptions=AUTOERASEANDFLASH RUNANDSTOPAFTERLOAD="main"
CPU=HC12
MainFrame=2,3,-1,-1,-1,-1,-1395,253,-466,971
MainFrame=2,3,-1,-1,-1,-1,469,149,1398,867
TOOLBAR=57600 57601 32795 0 57635 57634 57637 0 57671 57669 0 32777 32776 32782 32780 32781 32778 0 32806
AEFWarningDialog=FALSE
Configuration=TBDML.hwc
......
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