Skip to content

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

✨ feat:静态电流放在第一步，其他步骤顺延

parent 5da94303
Show whitespace changes
Inline Side-by-side
Showing with 128 additions and 299 deletions
YueJin_test_bench/source/Appliciation/CAN_APP.c
View file @ 16cd2b2e
......@@ -287,7 +287,7 @@ void can_submit(void)
// // uint8_t data7[8] = {0, 0, 0, 0, 0, 0, 0, 0};
// POWER_CTRL_KL30 = 1u; //B+
// POWER_CTRL_KL15 = 1u; //KL15
if((MENU_CHECK_STEP != 6) && (MENU_CHECK_STEP != 10) && (MENU_CHECK_STEP != 11))
if((MENU_CHECK_STEP != 7) && (MENU_CHECK_STEP != 11) && (MENU_CHECK_STEP != 1))
{
/* ABS故障指示灯 */
data1[5] = 0x00;
......@@ -299,6 +299,10 @@ void can_submit(void)
switch (MENU_CHECK_STEP)
{
case 1:
// POWER_CTRL_KL30 = 0u; //B+
// POWER_CTRL_KL15 = 0u; //KL15
break;
case 2:
/* 车速 */ //22
data1[0] = 0x01;
data1[1] = 0x87;
......@@ -339,7 +343,7 @@ void can_submit(void)
data8[2] = 0x00; //TCS
init_CAN_Frame(&m_msg8, 0x51B, 8, 1, data8);
break;
case 2:
case 3:
/* 车速 */
data1[0] = 0x02;
data1[1] = 0xF0;
......@@ -378,7 +382,7 @@ void can_submit(void)
data8[2] = 0x00; //TCS
init_CAN_Frame(&m_msg8, 0x51B, 8, 1, data8);
break;
case 3:
case 4:
/* 车速 */
data1[0] = 0x04;
data1[1] = 0x60;
......@@ -417,7 +421,7 @@ void can_submit(void)
data8[2] = 0x00; //TCS
init_CAN_Frame(&m_msg8, 0x51B, 8, 1, data8);
break;
case 4:
case 5:
/* 车速 */
data1[0] = 0x05;
data1[1] = 0xE0;
......@@ -456,7 +460,7 @@ void can_submit(void)
data8[2] = 0x00; //TCS
init_CAN_Frame(&m_msg8, 0x51B, 8, 1, data8);
break;
case 5:
case 6:
/* 车速 */
data1[0] = 0x06;
data1[1] = 0xA1;
......@@ -495,7 +499,7 @@ void can_submit(void)
data8[2] = 0x00; //TCS
init_CAN_Frame(&m_msg8, 0x51B, 8, 1, data8);
break;
case 6:
case 7:
/* 车速 */
data1[0] = 0x09;
data1[1] = 0x40;
......@@ -537,7 +541,7 @@ void can_submit(void)
init_CAN_Frame(&m_msg8, 0x51B, 8, 1, data8);
break;
case 7:
case 8:
/* 车速 */
data1[0] = 0x0B;
data1[1] = 0xE0;
......@@ -578,7 +582,7 @@ void can_submit(void)
data8[2] = 0x04; //TCS
init_CAN_Frame(&m_msg8, 0x51B, 8, 1, data8);
break;
case 8:
case 9:
/* 车速 */
data1[0] = 0x0D;
data1[1] = 0xE4;
......@@ -621,7 +625,7 @@ void can_submit(void)
init_CAN_Frame(&m_msg8, 0x51B, 8, 1, data8);
break;
case 9:
case 10:
/* 车速 */
data1[0] = 0x0D;
data1[1] = 0xE4;
......@@ -664,7 +668,7 @@ void can_submit(void)
data8[2] = 0x00; //TCS
init_CAN_Frame(&m_msg8, 0x51B, 8, 1, data8);
break;
case 10:
case 11:
/* 车速 */
data1[0] = 0x0D;
data1[1] = 0xE4;
......@@ -709,7 +713,7 @@ void can_submit(void)
init_CAN_Frame(&m_msg8, 0x51B, 8, 1, data8);
break;
case 11:
case 12:
POWER_CTRL_KL30 = 0u; //B+
POWER_CTRL_KL15 = 0u; //KL15
break;
......@@ -823,7 +827,7 @@ void can_submit(void)
default:
break;
}
if(MENU_CHECK_STEP != 0 && MENU_CHECK_STEP<11)
if((MENU_CHECK_STEP != 0) && (MENU_CHECK_STEP < 12) && ((MENU_CHECK_STEP != 1)))
{
can_mid(m_msg1);
can_mid(m_msg2);
......@@ -1612,182 +1616,12 @@ void resetpower(void)
}
void resetchangeUDSfuc(void)
{
// if((MENU_CHECK_STEP == 0 || MENU_CHECK_STEP == 10) && resettime == 0)
// {
// fakedelay = 0;
// UDS_time = 0;
// getseedresult = 0;
// fakedelay = 0;
// if(MENU_CHECK_STEP == 10)
// {
// resetpower();
// }
// else
// {
// resettime = 1;
// chaengUDSstep = 0;
// }
// }
// if(MENU_CHECK_STEP != 0 && MENU_CHECK_STEP != 10)
// {
// resettime = 0;
// }
}
uint8_t vspeedpeizhi = 0;
uint8_t trackmode = 0;
void change_UDS_DID(void)
{
// if(MENU_CHECK_STEP != 0)
// {
// vspeedpeizhi = 0x4;
// trackmode = 1;
// }
// else
// {
// vspeedpeizhi = 0x3;
// trackmode = 0;
// }
// CAN_Frame_st_t m_msg;
// uint8_t data[8] = {0, 0, 0, 0, 0, 0, 0, 0};
// switch (chaengUDSstep)
// {
// case 0:
// resetflag = 1;
// data[0] = 0x02;
// data[1] = 0x10;
// data[2] = 0x03;
// data[3] = 0xAA;
// data[4] = 0xAA;
// data[5] = 0xAA;
// data[6] = 0xAA;
// data[7] = 0xAA;
// init_CAN_Frame(&m_msg, 0x7A1, 8, 1, data);
// can_mid(m_msg);
// POWER_CTRL_KL30 = 1u; //B+
// POWER_CTRL_KL15 = 1u; //KL15
// chaengUDSstep++;
// break;
// case 1:
// data[0] = 0x02;
// data[1] = 0x27;
// data[2] = 0x01;
// data[3] = 0xAA;
// data[4] = 0xAA;
// data[5] = 0xAA;
// data[6] = 0xAA;
// data[7] = 0xAA;
// init_CAN_Frame(&m_msg, 0x7A1, 8, 1, data);
// can_mid(m_msg);
// chaengUDSstep++;
// break;
// case 2:
// get_seed_msg();
// if(getseedresult == 1)
// {
// chaengUDSstep++;
// }
// break;
// case 3:
// data[0] = 0x06;
// data[1] = 0x27;
// data[2] = 0x02;
// data[3] = seedresult[0];
// data[4] = seedresult[1];
// data[5] = seedresult[2];
// data[6] = seedresult[3];
// data[7] = 0xAA;
// init_CAN_Frame(&m_msg, 0x7A1, 8, 1, data);
// can_mid(m_msg);
// chaengUDSstep++;
// break;
// case 4:
// data[0] = 0x10;
// data[1] = 0x13;
// data[2] = 0x2E;
// data[3] = 0xF0;
// data[4] = 0x10;
// data[5] = 0x03;
// data[6] = 0xBF;
// data[7] = 0xFD;
// init_CAN_Frame(&m_msg, 0x7A1, 8, 1, data);
// can_mid(m_msg);
// chaengUDSstep++;
// break;
// case 5:
// data[0] = 0x21;
// data[1] = 0xE7;
// data[2] = vspeedpeizhi;//车速配置四:0x03 车速配置五：0x04
// data[3] = 0x03;
// data[4] = 0x98;
// data[5] = 0x20;
// data[6] = 0x00;
// data[7] = 0x00;
// init_CAN_Frame(&m_msg, 0x7A9, 8, 1, data);
// can_mid(m_msg);
// chaengUDSstep++;
// break;
// case 6:
// data[0] = 0x22;
// data[1] = 0x00;
// data[2] = 0x00;
// data[3] = 0x00;
// data[4] = 0x00;
// data[5] = 0x00;
// data[6] = 0x00;
// data[7] = 0xAA;
// init_CAN_Frame(&m_msg, 0x7A9, 8, 1, data);
// can_mid(m_msg);
// chaengUDSstep++;
// break;
// case 7:
// {//履带模式开关
// data[0] = 0x04;
// data[1] = 0x2E;
// data[2] = 0x03;
// data[3] = 0x0A;
// data[4] = trackmode;//1:开 0：关
// data[5] = 0xAA;
// data[6] = 0xAA;
// data[7] = 0xAA;
// init_CAN_Frame(&m_msg, 0x7A1, 8, 1, data);
// can_mid(m_msg);
// chaengUDSstep++;
// break;
// }
// case 8:
// // POWER_CTRL_KL30 = 0u; //B+
// // POWER_CTRL_KL15 = 0u; //KL15
// if(UDS_time < 100)
// {
// UDS_time++;
// }
// else
// {
// chaengUDSstep++;
// }
// break;
// case 9:
// POWER_CTRL_KL30 = 1u; //B+
// POWER_CTRL_KL15 = 1u; //KL15
// if(UDS_time < 50)
// {
// UDS_time++;
// }
// else
// {
// chaengUDSstep++;
// }
// break;
// default:
// cycleflag = 1;
// resetflag = 0;
// break;
// }
}
uint32_t testseed;
void get_seed_msg(void)
......
YueJin_test_bench/source/Appliciation/Check_Ctrl.c
View file @ 16cd2b2e
......@@ -616,19 +616,14 @@ void Function_Check_Ctrl(uint32_t cmd)
}
case 1:
{
/*负控*/
// LINE_OUT_NEG_01 = 0;
// LINE_OUT_NEG_02 = 0;
// LINE_OUT_NEG_03 = 0;
// LINE_OUT_NEG_04 = 0;
// LINE_OUT_NEG_05 = 1;
// LINE_OUT_NEG_06 = 1;
// LINE_OUT_NEG_07 = 0;
// LINE_OUT_NEG_08 = 0;
// LINE_OUT_NEG_09 = 1;
// LINE_OUT_NEG_10 = 0;
POWER_CTRL_KL30 = 0u; //B+
POWER_CTRL_KL15 = 0u; //KL15
break;
}
case 2:
{
POWER_CTRL_KL30 = 1u; //B+
POWER_CTRL_KL15 = 1u; //KL15
/*正控*/
// LINE_OUT_POS_01 = 1; //右转
LINE_OUT_POS_04 = 1; //左转
......@@ -640,7 +635,7 @@ void Function_Check_Ctrl(uint32_t cmd)
break;
}
case 2:
case 3:
{
/*负控*/
// LINE_OUT_NEG_01 = 0;
......@@ -667,7 +662,7 @@ void Function_Check_Ctrl(uint32_t cmd)
break;
}
case 3:
case 4:
{
// LINE_OUT_NEG_01 = 0;
// LINE_OUT_NEG_02 = 0;
......@@ -692,7 +687,7 @@ void Function_Check_Ctrl(uint32_t cmd)
FUEL_RES_4 = 0;
break;
}
case 4:
case 5:
{
// LINE_OUT_NEG_01 = 0;
// LINE_OUT_NEG_02 = 0;
......@@ -721,7 +716,7 @@ void Function_Check_Ctrl(uint32_t cmd)
break;
}
case 5:
case 6:
{
// LINE_OUT_NEG_01 = 0;
// LINE_OUT_NEG_02 = 0;
......@@ -748,7 +743,7 @@ void Function_Check_Ctrl(uint32_t cmd)
break;
}
case 6:
case 7:
{
// LINE_OUT_NEG_01 = 0;
// LINE_OUT_NEG_02 = 0;
......@@ -774,7 +769,7 @@ void Function_Check_Ctrl(uint32_t cmd)
FUEL_RES_4 = 0;
break;
}
case 7:
case 8:
{
// LINE_OUT_NEG_01 = 1;
// LINE_OUT_NEG_02 = 0;
......@@ -801,7 +796,7 @@ void Function_Check_Ctrl(uint32_t cmd)
FUEL_RES_4 = 0;
break;
}
case 8:
case 9:
{
// LINE_OUT_NEG_01 = 0;
// LINE_OUT_NEG_02 = 1;
......@@ -828,7 +823,7 @@ void Function_Check_Ctrl(uint32_t cmd)
FUEL_RES_4 = 0;
break;
}
case 9:
case 10:
{
// LINE_OUT_NEG_01 = 0;
// LINE_OUT_NEG_02 = 0;
......@@ -851,7 +846,7 @@ void Function_Check_Ctrl(uint32_t cmd)
FUEL_RES_4 = 0;
break;
}
case 10:
case 11:
{
// LINE_OUT_NEG_01 = 0;
// LINE_OUT_NEG_02 = 0;
......
YueJin_test_bench/source/Appliciation/Display_Info.c
View file @ 16cd2b2e
......@@ -4194,7 +4194,7 @@ void Get_static_Current(void)
{
static uint32_t loc_Timer = 0;
static uint32_t loc_ret = 0;
if(MENU_CHECK_STEP == 11)
if(MENU_CHECK_STEP == 1)
{
loc_Current_0 = ADC_Read_Signal(ADC_CH_KL15_VOLTAGE);
loc_ret += loc_Current_0;
......@@ -4227,7 +4227,7 @@ void Get_static_Current(void)
}
else
{
MENU_CHECK_STEP = 11;
MENU_CHECK_STEP = 1;
// CurrentWrong = 1;
}
}
......@@ -4777,9 +4777,9 @@ void Display_Send_Vspead(uint8_t menu)
Type_Clear = menu;
Display_TFT_Clear();
}
if(menu > 0)
if(menu > 1)
{
if(menu < 11 )
if(menu < 12 )
{
GUI_General_Digit_Display(menu, Num_15, 2, 0, pagenum, 3);
// TFT_LCD_Draw_Bmp(3, 40, ( uint8_t * )gImage_Dey_words_1X6_Y16);//车速
......@@ -4808,7 +4808,7 @@ void Display_Send_Vspead(uint8_t menu)
}
switch (menu)
{
case 1:
case 2:
WaterTemp = 1;
fuel_val = 5;
VSpeed_val = 22;
......@@ -4823,7 +4823,7 @@ void Display_Send_Vspead(uint8_t menu)
break;
case 2:
case 3:
WaterTemp = 1;
fuel_val = 4;
VSpeed_val = 44;
......@@ -4839,7 +4839,7 @@ void Display_Send_Vspead(uint8_t menu)
break;
case 3:
case 4:
WaterTemp = 2;
fuel_val = 3;
VSpeed_val = 66;
......@@ -4853,7 +4853,7 @@ void Display_Send_Vspead(uint8_t menu)
// TFT_LCD_Draw_Bmp(100, 40+25+25+25+25+25+25+25+25, ( uint8_t * )gImage_pic_09X0_Y0);//work驾驶模式
break;
case 4:
case 5:
WaterTemp = 4;
fuel_val = 2;
VSpeed_val = 88;
......@@ -4867,7 +4867,7 @@ void Display_Send_Vspead(uint8_t menu)
// // TFT_LCD_Draw_Bmp(70, 40+25+25+25+25+25+25+25, ( uint8_t * )gImage_pic_09X0_Y0);//work驾驶模式
break;
case 5:
case 6:
WaterTemp = 5;
fuel_val = 1;
VSpeed_val = 100;
......@@ -4882,7 +4882,7 @@ void Display_Send_Vspead(uint8_t menu)
// TFT_LCD_Draw_Bmp(100, 40+25+25+25+25+25+25+25+25, ( uint8_t * )gImage_WZ_word0_06X0_Y0);//H档
break;
case 6:
case 7:
WaterTemp = 5;
fuel_val = 1;
VSpeed_val = 140;
......@@ -4899,7 +4899,7 @@ void Display_Send_Vspead(uint8_t menu)
// TFT_LCD_Draw_Bmp(100, 40+25+25+25+25+25+25+25+25, ( uint8_t * )gImage_WZ_word0_07X0_Y0);//P档
break;
case 7:
case 8:
WaterTemp = 5;
fuel_val = 1;
VSpeed_val = 180;
......@@ -4917,7 +4917,7 @@ void Display_Send_Vspead(uint8_t menu)
break;
case 8:
case 9:
WaterTemp = 5;
fuel_val = 1;
VSpeed_val = 199;
......@@ -4934,7 +4934,7 @@ void Display_Send_Vspead(uint8_t menu)
break;
case 9:
case 10:
WaterTemp = 5;
fuel_val = 1;
VSpeed_val = 199;
......@@ -4950,7 +4950,7 @@ void Display_Send_Vspead(uint8_t menu)
// TFT_LCD_Draw_Bmp(150, 40+25+25+25+25+25+25+25+25, ( uint8_t * )gImage_pic_18X0_Y0);//制动失效指示灯
break;
case 10:
case 11:
WaterTemp = 5;
fuel_val = 1;
VSpeed_val = 199;
......@@ -5028,14 +5028,14 @@ void Display_Send_Vspead(uint8_t menu)
// // }
// Display_TFT_Clear();
// break;
case 11:
case 12:
HW_Static_Current_Check(1);
break;
default:
// MENU_CHECK_STEP = 0;
break;
}
if(menu < 11 && menu != 0)
if((menu < 12) && (menu != 0) && (menu != 1))
{
GUI_General_Digit_Display(VSpeed_val, Num_15, 3, 2, ODODigitNum09PosX, 40);
GUI_General_Digit_Display(ESpeed_val, Num_15, 5, 3, ODODigitNum09PosX,40+25);
......@@ -5067,60 +5067,60 @@ void Display_Send_Vspead(uint8_t menu)
199km/h 700*/
void Buzzer_Start(void)
{
PWM_Channel_Init(9,0,0,0,0);
// PWM_Channel_Init(9,0,0,0,0);
switch (MENU_CHECK_STEP)
{
case 0:
// PWM_Channel_Set_Freq(11,0);
PWM_Channel_Set_Duty(9, 1000);
break;
case 1:
PWM_Channel_Set_Freq(9,35);
break;
case 2:
PWM_Channel_Set_Freq(9,68);
break;
case 3:
PWM_Channel_Set_Freq(9,101);
break;
case 4:
PWM_Channel_Set_Freq(9,137);
break;
case 5:
PWM_Channel_Set_Freq(9,170);
break;
case 6:
PWM_Channel_Set_Freq(9,205);
break;
case 7:
PWM_Channel_Set_Freq(9,237);
break;
case 8:
PWM_Channel_Set_Freq(9,271);
break;
case 9:
PWM_Channel_Set_Freq(9,304);
break;
case 10:
PWM_Channel_Set_Freq(9,390);
break;
case 11:
PWM_Channel_Set_Freq(9,453);
break;
case 12:
PWM_Channel_Set_Freq(9,518);
break;
case 13:
PWM_Channel_Set_Freq(9,700);
break;
default:
break;
}
if(MENU_CHECK_STEP != 0)
{
PWM_Channel_Set_Duty(9, 500);
}
// switch (MENU_CHECK_STEP)
// {
// case 0:
// // PWM_Channel_Set_Freq(11,0);
// PWM_Channel_Set_Duty(9, 1000);
// break;
// case 1:
// PWM_Channel_Set_Freq(9,35);
// break;
// case 2:
// PWM_Channel_Set_Freq(9,68);
// break;
// case 3:
// PWM_Channel_Set_Freq(9,101);
// break;
// case 4:
// PWM_Channel_Set_Freq(9,137);
// break;
// case 5:
// PWM_Channel_Set_Freq(9,170);
// break;
// case 6:
// PWM_Channel_Set_Freq(9,205);
// break;
// case 7:
// PWM_Channel_Set_Freq(9,237);
// break;
// case 8:
// PWM_Channel_Set_Freq(9,271);
// break;
// case 9:
// PWM_Channel_Set_Freq(9,304);
// break;
// case 10:
// PWM_Channel_Set_Freq(9,390);
// break;
// case 11:
// PWM_Channel_Set_Freq(9,453);
// break;
// case 12:
// PWM_Channel_Set_Freq(9,518);
// break;
// case 13:
// PWM_Channel_Set_Freq(9,700);
// break;
// default:
// break;
// }
// if(MENU_CHECK_STEP != 0)
// {
// PWM_Channel_Set_Duty(9, 500);
// }
}
......
YueJin_test_bench/source/Appliciation/Key_user.c
View file @ 16cd2b2e
......@@ -136,7 +136,7 @@ void Key_Operation_SW2(Key_Event_en_t enKeyEvent)
if ( enKeyEvent == KEY_EVENT_SHORT_PRESS )
{
MENU_CHECK_STEP_ADD( );
if((MENU_CHECK_STEP < 6) && (MENU_CHECK_STEP > 0))
if((MENU_CHECK_STEP < 7) && (MENU_CHECK_STEP > 1))
{
IG_OFF_Flag = 1;
}
......@@ -177,7 +177,7 @@ void Key_Operation_SW1(Key_Event_en_t enKeyEvent)
// }
Display_TFT_Clear_UID2();
}
else if (( enKeyEvent == KEY_EVENT_LONG_PRESS ) && (MENU_CHECK_STEP == 10))
else if (( enKeyEvent == KEY_EVENT_LONG_PRESS ) && (MENU_CHECK_STEP == 11))
{
LINE_OUT_NEG_02 = 1;
}
......
YueJin_test_bench/source/Appliciation/Task.c
View file @ 16cd2b2e
......@@ -75,29 +75,29 @@ extern uint8_t fuelreset3;
extern uint8_t fuelreset4;
void Sys_Run_Mode_10ms_Tasks_Group(void)
{
if(MENU_CHECK_STEP == 1 && fuelreset1 == 0)
{
fuelreset1 = 1;
}
else if(MENU_CHECK_STEP == 2 && fuelreset2 == 0)
{
fuelreset2 = 1;
}
else if(MENU_CHECK_STEP == 3 && fuelreset3 == 0)
{
fuelreset3 = 1;
}
else if(MENU_CHECK_STEP == 4 && fuelreset4 == 0)
{
fuelreset4 = 1;
}
if(MENU_CHECK_STEP == 0)
{
fuelreset1 = 0;
fuelreset2 = 0;
fuelreset3 = 0;
fuelreset4 = 0;
}
// if(MENU_CHECK_STEP == 1 && fuelreset1 == 0)
// {
// fuelreset1 = 1;
// }
// else if(MENU_CHECK_STEP == 2 && fuelreset2 == 0)
// {
// fuelreset2 = 1;
// }
// else if(MENU_CHECK_STEP == 3 && fuelreset3 == 0)
// {
// fuelreset3 = 1;
// }
// else if(MENU_CHECK_STEP == 4 && fuelreset4 == 0)
// {
// fuelreset4 = 1;
// }
// if(MENU_CHECK_STEP == 0)
// {
// fuelreset1 = 0;
// fuelreset2 = 0;
// fuelreset3 = 0;
// fuelreset4 = 0;
// }
if(fuelreset1 == 1 || fuelreset2 == 1 || fuelreset3 == 1 || fuelreset4 == 1)
{
resetpowerfuel();
......
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