Skip to content

J
jiancetai
Commit 96439792 authored by 李鑫3's avatar 李鑫3
Browse files
Options

✨ feat:添加基础功能

parent ea4d9dcf
Expand all Show whitespace changes
Inline Side-by-side
Showing with 457 additions and 155 deletions
YueJin_test_bench/source/Appliciation/CAN_APP.c
View file @ 96439792
......@@ -812,22 +812,22 @@ void can_submit(void)
init_CAN_Frame(&m_msg1, 0x260, 8, 1, data1);
/* 时间 */
data2[3] = 0x06;
data2[3] = 0xFF;
init_CAN_Frame(&m_msg2, 0x687, 8, 1, data2);
data3[2]=0x00;
data3[2]=0x64;
init_CAN_Frame(&m_msg3, 0x180, 8, 1, data3);
data4[0] = 0x04; //ABS
data4[0] = 0x14; //ABS
init_CAN_Frame(&m_msg4, 0x261, 8, 1, data4);
data5[4] = 0x40; //发动机无法启动指示灯
// data5[1]=0x07;
// data5[2]=0xD0;
data5[1]=0x07;
data5[2]=0xD0;
init_CAN_Frame(&m_msg5, 0x120, 8, 1, data5);
data6[2] = 0x00; //配置为AB
data6[4] = 0x30; //ASR指示灯
data6[4] = 0x00; //ASR指示灯
init_CAN_Frame(&m_msg6, 0x200, 8, 1, data6);
data7[5] = 0x80; //侧支架指示灯，发动机故障
......@@ -846,14 +846,13 @@ void can_submit(void)
init_CAN_Frame(&m_msg1, 0x260, 8, 1, data1);
/* 时间 */
data2[3] = 0x17;
data2[4] = 0x0B;
data2[3] = 0xFF;
init_CAN_Frame(&m_msg2, 0x687, 8, 1, data2);
data3[2]=0x64;
init_CAN_Frame(&m_msg3, 0x180, 8, 1, data3);
data4[0] = 0x04; //ABS
data4[0] = 0x14; //ABS
init_CAN_Frame(&m_msg4, 0x261, 8, 1, data4);
data5[4] = 0x40; //发动机无法启动指示灯
......@@ -865,11 +864,12 @@ void can_submit(void)
data6[4] = 0x00; //ASR指示灯
init_CAN_Frame(&m_msg6, 0x200, 8, 1, data6);
data7[5] = 0x84; //侧支架指示灯，发动机故障
data7[5] = 0x80; //侧支架指示灯，发动机故障
init_CAN_Frame(&m_msg7, 0x100, 8, 1, data7);
data9[0]=0x00;
init_CAN_Frame(&m_msg9, 0x130, 8, 1, data9);
data8[5]=0x00;
init_CAN_Frame(&m_msg8, 0x330, 8, 1, data8);
break;
......@@ -879,26 +879,25 @@ void can_submit(void)
init_CAN_Frame(&m_msg1, 0x260, 8, 1, data1);
/* 时间 */
data2[3] = 0x17;
data2[4] = 0x0B;
init_CAN_Frame(&m_msg2, 0x687, 8, 1, data2);
data3[2]=0x71;
data3[2]=0x64;
init_CAN_Frame(&m_msg3, 0x180, 8, 1, data3);
data4[0] = 0x04; //ABS
data4[0] = 0x18; //ABS
init_CAN_Frame(&m_msg4, 0x261, 8, 1, data4);
data5[4] = 0x40; //发动机无法启动指示灯
data5[1]=0x0F;
data5[2]=0xA0;
data5[4] = 0x00; //发动机无法启动指示灯
data5[1]=0x07;
data5[2]=0xD0;
init_CAN_Frame(&m_msg5, 0x120, 8, 1, data5);
data6[2] = 0x00; //配置为AB
data6[4] = 0xD0; //ASR指示灯
data6[4] = 0x00; //ASR指示灯
init_CAN_Frame(&m_msg6, 0x200, 8, 1, data6);
data7[5] = 0x80; //侧支架指示灯，发动机故障
data7[5] = 0x84; //侧支架指示灯，发动机故障
init_CAN_Frame(&m_msg7, 0x100, 8, 1, data7);
data9[0]=0x00;
......@@ -913,26 +912,24 @@ void can_submit(void)
init_CAN_Frame(&m_msg1, 0x260, 8, 1, data1);
/* 时间 */
data2[3] = 0x17;
data2[4] = 0x0B;
data2[3] = 0xFF;
init_CAN_Frame(&m_msg2, 0x687, 8, 1, data2);
data3[2]=0x7D;
data3[2]=0x9C;
init_CAN_Frame(&m_msg3, 0x180, 8, 1, data3);
data4[0] = 0x04; //ABS
data4[0] = 0x14; //ABS
init_CAN_Frame(&m_msg4, 0x261, 8, 1, data4);
data5[4] = 0x40; //发动机无法启动指示灯
data5[1]=0x17;
data5[2]=0x70;
data5[1]=0x07;
data5[2]=0xD0;
init_CAN_Frame(&m_msg5, 0x120, 8, 1, data5);
data6[2] = 0x00; //配置为AB
data6[4] = 0xE0; //ASR指示灯
data6[4] = 0xC0; //ASR指示灯
init_CAN_Frame(&m_msg6, 0x200, 8, 1, data6);
data7[5] = 0x80; //侧支架指示灯，发动机故障
data7[5] = 0x00; //侧支架指示灯，发动机故障
init_CAN_Frame(&m_msg7, 0x100, 8, 1, data7);
data9[0]=0x00;
......@@ -947,33 +944,32 @@ void can_submit(void)
init_CAN_Frame(&m_msg1, 0x260, 8, 1, data1);
/* 时间 */
data2[3] = 0x17;
data2[4] = 0x0B;
data2[3] = 0xFF;
init_CAN_Frame(&m_msg2, 0x687, 8, 1, data2);
data3[2]=0x96;
data3[2]=0x64;
init_CAN_Frame(&m_msg3, 0x180, 8, 1, data3);
data4[0] = 0x95; //ABS
data4[0] = 0x14; //ABS
init_CAN_Frame(&m_msg4, 0x261, 8, 1, data4);
data5[4] = 0x40; //发动机无法启动指示灯
data5[1]=0x1F;
data5[2]=0x40;
data5[1]=0x07;
data5[2]=0xD0;
init_CAN_Frame(&m_msg5, 0x120, 8, 1, data5);
data6[2] = 0x00; //配置为AB
data6[4] = 0x20; //ASR指示灯
data6[4] = 0x00; //ASR指示灯
init_CAN_Frame(&m_msg6, 0x200, 8, 1, data6);
data7[5] = 0x00; //侧支架指示灯，发动机故障
data7[5] = 0x80; //侧支架指示灯，发动机故障
init_CAN_Frame(&m_msg7, 0x100, 8, 1, data7);
data9[0]=0x00;
init_CAN_Frame(&m_msg9, 0x130, 8, 1, data9);
data8[5]=0x00;
init_CAN_Frame(&m_msg8, 0x330, 8, 1, data8);
break;
case 6:
data1[2] = 0x4D;
......@@ -981,23 +977,22 @@ void can_submit(void)
init_CAN_Frame(&m_msg1, 0x260, 8, 1, data1);
/* 时间 */
data2[3] = 0x00;
// data2[4] = 0x0B;
data2[3] = 0xFF;
init_CAN_Frame(&m_msg2, 0x687, 8, 1, data2);
data3[2]=0x96;
data3[2]=0x64;
init_CAN_Frame(&m_msg3, 0x180, 8, 1, data3);
data4[0] = 0x24; //ABS
data4[0] = 0x14; //ABS
init_CAN_Frame(&m_msg4, 0x261, 8, 1, data4);
data5[4] = 0x00; //发动机无法启动指示灯
data5[1]=0x27;
data5[2]=0x10;
data5[4] = 0x40; //发动机无法启动指示灯
data5[1]=0x07;
data5[2]=0xD0;
init_CAN_Frame(&m_msg5, 0x120, 8, 1, data5);
data6[2] = 0x00; //配置为AB
data6[4] = 0x20; //ASR指示灯
data6[4] = 0x00; //ASR指示灯
init_CAN_Frame(&m_msg6, 0x200, 8, 1, data6);
data7[5] = 0x80; //侧支架指示灯，发动机故障
......@@ -1005,7 +1000,8 @@ void can_submit(void)
data9[0]=0x00;
init_CAN_Frame(&m_msg9, 0x130, 8, 1, data9);
data8[5]=0x80;
data8[5]=0x00;
init_CAN_Frame(&m_msg8, 0x330, 8, 1, data8);
break;
// case 6:
......@@ -1110,7 +1106,7 @@ void can_submit(void)
// data2[4] = 0x0B;
init_CAN_Frame(&m_msg2, 0x687, 8, 1, data2);
data3[2]=0x96;
data3[2]=0x9C;
init_CAN_Frame(&m_msg3, 0x180, 8, 1, data3);
data4[0] = 0x08; //ABS
......@@ -1121,11 +1117,11 @@ void can_submit(void)
data5[2]=0xE0;
init_CAN_Frame(&m_msg5, 0x120, 8, 1, data5);
data6[2] = 0x00; //配置为AB
data6[2] = 0x9A; //配置为AB
data6[4] = 0xD0; //ASR指示灯
init_CAN_Frame(&m_msg6, 0x200, 8, 1, data6);
data7[5] = 0x06; //侧支架指示灯，发动机故障
data7[5] = 0x14; //侧支架指示灯，发动机故障
init_CAN_Frame(&m_msg7, 0x100, 8, 1, data7);
data9[0]=0x00;
......@@ -1172,32 +1168,33 @@ void can_submit(void)
init_CAN_Frame(&m_msg1, 0x260, 8, 1, data1);
/* 时间 */
data2[3] = 0x00;
// data2[4] = 0x0B;
data2[3] = 0xFF;
init_CAN_Frame(&m_msg2, 0x687, 8, 1, data2);
data3[2]=0x00;
data3[2]=0x64;
init_CAN_Frame(&m_msg3, 0x180, 8, 1, data3);
data4[0] = 0x00; //ABS
data4[0] = 0x14; //ABS
init_CAN_Frame(&m_msg4, 0x261, 8, 1, data4);
data5[4] = 0x00; //发动机无法启动指示灯
data5[1]=0x00;
data5[2]=0x00;
data5[4] = 0x40; //发动机无法启动指示灯
data5[1]=0x07;
data5[2]=0xD0;
init_CAN_Frame(&m_msg5, 0x120, 8, 1, data5);
data6[2] = 0x00; //配置为AB
data6[4] = 0x00; //ASR指示灯
init_CAN_Frame(&m_msg6, 0x200, 8, 1, data6);
data7[5] = 0x00; //侧支架指示灯，发动机故障
data7[5] = 0x80; //侧支架指示灯，发动机故障
init_CAN_Frame(&m_msg7, 0x100, 8, 1, data7);
data9[0]=0x00;
init_CAN_Frame(&m_msg9, 0x130, 8, 1, data9);
data8[5]=0x00;
init_CAN_Frame(&m_msg8, 0x330, 8, 1, data8);
break;
default:
break;
}
......
YueJin_test_bench/source/Appliciation/Check_Ctrl.c
View file @ 96439792
......@@ -681,16 +681,9 @@ void Function_Check_Ctrl(uint32_t cmd)
/*正控*/
if(POWER_CTRL_KL15==1)
{
LINE_OUT_POS_02 = 1; //远光
// if(LIN_Flag.LIN_RIGHT_Flag==0)
// {
LINE_FUEL_RES04222 = 1;//右转
Gen_TimeDelay (200 *1000,50U);
LINE_FUEL_RES04222=0;
// LIN_Flag.LIN_RIGHT_Flag++;
// }
LINE_FUEL_RES04111 = 0;//左转
LINE_OUT_POS_02 = 0; //远光
LINE_FUEL_RES04111 = 0; //左转
LINE_FUEL_RES04222 = 0; //右转
LINE_OUT_POS_11 = 0; //防盗
LINE_OUT_POS_12 = 0; //机油压力
/*燃油5200,93,55,10*/
......@@ -725,20 +718,18 @@ void Function_Check_Ctrl(uint32_t cmd)
/*正控*/
if(POWER_CTRL_KL15==1)
{
LINE_RESET=1;
LINE_OUT_POS_02 = 0; //远光
// if(LIN_Flag.LIN_LEFT_Flag==0)
LINE_OUT_POS_02 = 1; //远光
// if(LIN_Flag.LIN_RIGHT_Flag==0)
// {
LINE_FUEL_RES04111 = 1;
Gen_TimeDelay ( 200 *1000,50U);
LINE_FUEL_RES04111=0;
// LIN_Flag.LIN_LEFT_Flag++;
LINE_FUEL_RES04222 = 1;//右转
Gen_TimeDelay (200 *1000,50U);
LINE_FUEL_RES04222=0;
// LIN_Flag.LIN_RIGHT_Flag++;
// }
LINE_FUEL_RES04111 = 0;//左转
LINE_FUEL_RES04222 = 0;//右转
LINE_OUT_POS_11 = 1; //防盗
LINE_OUT_POS_12 = 1; //机油压力
LINE_OUT_POS_11 = 0; //防盗
LINE_OUT_POS_12 = 0; //机油压力
/*燃油*/
FUEL_RES_1 = 0;//2格
FUEL_RES_2 = 1;
......@@ -746,7 +737,7 @@ void Function_Check_Ctrl(uint32_t cmd)
FUEL_RES_4 = 0;
//温度
FUEL_T_1=0;
FUEL_T_2=0;
FUEL_T_2=1;
FUEL_T_3=0;
FUEL_T_4=0;
}
......@@ -769,16 +760,20 @@ void Function_Check_Ctrl(uint32_t cmd)
/*正控*/
if(POWER_CTRL_KL15==1)
{
LINE_RESET=1;
LINE_OUT_POS_02 = 0; //远光
LINE_FUEL_RES04111 = 0;//左转
// if(LIN_Flag.LIN_LEFT_Flag==0)
// {
LINE_FUEL_RES04111 = 1;
Gen_TimeDelay ( 200 *1000,50U);
LINE_FUEL_RES04111=0;
// LIN_Flag.LIN_LEFT_Flag++;
// }
LINE_FUEL_RES04222 = 0;//右转
LINE_OUT_POS_11 = 0; //防盗
LINE_OUT_POS_11 = 1; //防盗
LINE_OUT_POS_12 = 1; //机油压力
// if(LIN_Flag.LIN_LEFT_Flag==1 || LIN_Flag.LIN_RIGHT_Flag==1)
// {
LINE_RESET=1; //复位
Gen_TimeDelay ( 100 *1000,50U);
LINE_RESET=0;
// flagtime ++;
// }
// if(flagtime==3)
......@@ -868,7 +863,7 @@ void Function_Check_Ctrl(uint32_t cmd)
FUEL_RES_4 = 1;
//温度
FUEL_T_1=0;
FUEL_T_2=1;
FUEL_T_2=0;
FUEL_T_3=0;
FUEL_T_4=0;
......
YueJin_test_bench/source/Appliciation/Task.c
View file @ 96439792
......@@ -135,7 +135,7 @@ void Sys_Run_Mode_10ms_Tasks_Group(void)
{
if((writeflag == 1) && (POWER_CTRL_KL15==1))
{
UIDWrite();
// UIDWrite();
}
}
......@@ -157,7 +157,7 @@ void Sys_Run_Mode_10ms_Tasks_Group(void)
Meter_field_display(MENU_CHECK_STEP);
// Meter_field_display(MENU_CHECK_STEP);
//刷数字、刷英文拼写。
//GUI_General_Digit_Display(123456789, Num_09, 10, 0, BackLightDigitNum09PosX, 79);
//GUI_General_Digit_Display(123456789, Num_10_03, 10, 0, BackLightDigitNum09PosX, 79+24*1);
......@@ -420,7 +420,7 @@ if(LINE_RESET == 1)
POWER_CTRL_KL30 = 1u; //B+
POWER_CTRL_KL15 = 0u; //KL15
LINE_OUT_key = 1;
if(delay==11)
if(delay==61)
{
POWER_CTRL_KL30 = 1u; //B+
POWER_CTRL_KL15 = 1u; //KL15
......@@ -519,7 +519,22 @@ if(LINE_RESET == 1)
igonoff=7;
}
}
else if((MENU_CHECK_STEP==9) &&(igonoff ==7))
else if((MENU_CHECK_STEP==8) &&(igonoff ==7))
{
delay++;
// POWER_CTRL_KL30 = 0u; //B+
POWER_CTRL_KL15 = 0u; //KL15
LINE_OUT_cartoon=0;
if(delay==11)
{
// POWER_CTRL_KL30 = 1u; //B+
POWER_CTRL_KL15 = 1u; //KL15
LINE_OUT_cartoon=1;
delay=0;
igonoff=8;
}
}
else if((MENU_CHECK_STEP==9) &&(igonoff ==8))
{
delay++;
POWER_CTRL_KL30 = 0u; //B+
......
YueJin_test_bench/source/Driver/CAN/RSCAN.c
View file @ 96439792
......@@ -846,22 +846,10 @@ void RSCAN0_CH4_Receive(CAN_Frame_st_t *pstCANFrame)
{
ruanjianinsidebanbenhao[3] = u8getSWmsg1[1];
ruanjianinsidebanbenhao[4] = u8getSWmsg1[2];
ruanjianinsidebanbenhao[5] = u8getSWmsg1[3];
ruanjianinsidebanbenhao[6] = u8getSWmsg1[4];
ruanjianinsidebanbenhao[7] = u8getSWmsg1[5];
ruanjianinsidebanbenhao[8] = u8getSWmsg1[6];
ruanjianinsidebanbenhao[9] = u8getSWmsg1[7];
SWFlag=2;
zhenduanstep=2;
}
else if((u8getSWmsg1[0] == 0x22) && (SWFlag==2))
{
ruanjianinsidebanbenhao[10] = u8getSWmsg1[1];
ruanjianinsidebanbenhao[11] = u8getSWmsg1[2];
ruanjianinsidebanbenhao[12] = 0xFF;
General_Number_Disp(ruanjianinsidebanbenhao, 03, 50);
ruanjianinsidebanbenhao[5] = 0xFF;
General_Number_Disp(ruanjianinsidebanbenhao, 125, 25);
SWFlag=0;
zhenduanstep=2;
}
else if((u8getSWmsg1[0] == 0x10) && (u8getSWmsg1[4] == 0x81) && (SWoutflag==0))
{
......@@ -881,7 +869,7 @@ void RSCAN0_CH4_Receive(CAN_Frame_st_t *pstCANFrame)
ruanjianoutsidebanbenhao[7] = u8getSWmsg1[5];
ruanjianoutsidebanbenhao[8] = 0xFF;
General_Number_Disp(ruanjianoutsidebanbenhao, 03, 100);
General_Number_Disp(ruanjianoutsidebanbenhao, 125, 50);
// UDSStep = 2;
SWoutflag=2;
}
......@@ -902,7 +890,7 @@ void RSCAN0_CH4_Receive(CAN_Frame_st_t *pstCANFrame)
H630BUFFER[7] = u8getSWmsg1[5];
H630BUFFER[8]=0xFF;
General_Number_Disp(H630BUFFER, 110, 250);
General_Number_Disp(H630BUFFER, 125, 150);
// UDSStep = 2;
SWoutflag=4;
}
......@@ -923,7 +911,7 @@ void RSCAN0_CH4_Receive(CAN_Frame_st_t *pstCANFrame)
BOOT2[7] = u8getSWmsg1[5];
BOOT2[8]=0xFF;
General_Number_Disp(BOOT2, 110, 225);
General_Number_Disp(BOOT2, 125, 125);
// UDSStep = 2;
SWoutflag=6;
}
......@@ -949,7 +937,7 @@ void RSCAN0_CH4_Receive(CAN_Frame_st_t *pstCANFrame)
HWin[8] = 0xFF;
SWoutflag=8;
General_Number_Disp(HWin, 03, 150);
General_Number_Disp(HWin, 125, 75);
}
else if((u8getSWmsg1[0] == 0x10) && (u8getSWmsg1[4] == 0x29) && (SWoutflag==8))
{
......@@ -969,7 +957,7 @@ void RSCAN0_CH4_Receive(CAN_Frame_st_t *pstCANFrame)
HWout[8]=u8getSWmsg1[6];
HWout[9]=0xFF;
General_Number_Disp(HWout, 03, 200);
General_Number_Disp(HWout, 125, 100);
// UDSStep = 2;
SWoutflag=0;
}
......
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