Skip to content

J
jiancetai
Commit a265a6b9 authored by huangguoqing's avatar huangguoqing
Browse files
Options

✨ feat:修复模式切换间显示bug

parent ec5b69ef
Hide whitespace changes
Inline Side-by-side
Showing with 75 additions and 75 deletions
YueJin_test_bench/source/Appliciation/CAN_APP.c
View file @ a265a6b9
......@@ -556,3 +556,24 @@ void Can_Set_Buff_207(uint8_t CopyData [])
;
}
}
void CAN_Msg_Steps_100ms()
{
if(Student_Card_can_command==1)
{
Student_Card++;
}
else
{
Student_Card=0;
}
if(Query_Card_can_command==1)
{
Query_Card++;
}
else
{
Query_Card=0;
}
}
\ No newline at end of file
YueJin_test_bench/source/Appliciation/CAN_APP.h
View file @ a265a6b9
......@@ -278,8 +278,7 @@ void Can_Set_Buff_284(uint8_t CopyData []);
void Can_Set_Buff_786(uint8_t CopyData []);
void Can_Set_Buff_207(uint8_t CopyData []);
extern void Get_CAN_CH4_ID_750_Diagnosis_return1();
extern void Get_CAN_CH4_ID_750_Diagnosis_return2();
void CAN_Msg_Steps_100ms();
extern uint8_t VSpeed;
......
YueJin_test_bench/source/Appliciation/Display_Info.c
View file @ a265a6b9
......@@ -4502,52 +4502,55 @@ extern uint8_t test2[] = {0x01,0x02,0x03,0x04,0xE1,0xF2,0xA3,0xB4};
void Display_Chaka_Model(void)
{
if(Require_card_flag == 1)
if(All_Flag.u8flag[7] == 1)
{
Display_Num(0,0,can_car_return_Data[6],1);
Display_buffer_ID(20,150);
Display_buffer_ID(20,170);
Display_buffer_ID(20,190);
Display_buffer_ID(20,210);
Display_buffer_ID(20,230);
Display_buffer_ID(20,250);
if(can_car_return_Data[1] == 1)
{
Display_buffer_Data(can_car_return_Data,60,150);
}
else if(can_car_return_Data[1] == 2)
{
Display_buffer_Data(can_car_return_Data,60,170);
}
else if(can_car_return_Data[1] == 3)
if(Require_card_flag == 1)
{
Display_buffer_Data(can_car_return_Data,60,190);
}
else if(can_car_return_Data[1] == 4)
{
Display_buffer_Data(can_car_return_Data,60,210);
}
else if(can_car_return_Data[1] == 5)
{
Display_buffer_Data(can_car_return_Data,60,230);
Display_Num(0,0,can_car_return_Data[6],1);
Display_buffer_ID(20,150);
Display_buffer_ID(20,170);
Display_buffer_ID(20,190);
Display_buffer_ID(20,210);
Display_buffer_ID(20,230);
Display_buffer_ID(20,250);
if(can_car_return_Data[1] == 1)
{
Display_buffer_Data(can_car_return_Data,60,150);
}
else if(can_car_return_Data[1] == 2)
{
Display_buffer_Data(can_car_return_Data,60,170);
}
else if(can_car_return_Data[1] == 3)
{
Display_buffer_Data(can_car_return_Data,60,190);
}
else if(can_car_return_Data[1] == 4)
{
Display_buffer_Data(can_car_return_Data,60,210);
}
else if(can_car_return_Data[1] == 5)
{
Display_buffer_Data(can_car_return_Data,60,230);
}
else if(can_car_return_Data[1] == 6)
{
Display_buffer_Data(can_car_return_Data,60,250);
Require_card_flag = 0;
}
}
else if(can_car_return_Data[1] == 6)
if(can_car_return_Data[1] == 6)
{
Display_buffer_Data(can_car_return_Data,60,250);
Require_card_flag = 0;
memset(can_car_return_Data,0,sizeof(can_car_return_Data));
}
}
if(can_car_return_Data[1] == 6)
{
Require_card_flag = 0;
memset(can_car_return_Data,0,sizeof(can_car_return_Data));
}
}
void Display_buffer_ID(uint16_t X,uint8_t Y)
{
......@@ -4743,17 +4746,14 @@ const uint16_t CurrentDigitNum15PosX_2[] = {108,98};
uint8_t banbenhao[5]={0x56,0x31,0x30,0x32,0xff};
void Display_Can_Receive_Data(uint16_t X,uint8_t Y)
{
if(canData3[9]==0XFF&&canData2[13]==0XFF&&All_Flag.u8flag[8] == 1)
if(canData3[9] == 0XFF && canData2[13] == 0XFF && All_Flag.u8flag[8] == 1)
{
General_Number_Disp(canData2, X+70, Y);
General_Number_Disp(canData3, X+70, Y +50);
GUI_General_Digit_Display(text5[0], Num_15, 1, 0, CurrentDigitNum15PosX_1, 200);
TFT_LCD_Draw_Bmp(85,195, ( uint8_t * )FONT_TABLE[37] );
TFT_LCD_Draw_Bmp(85,195, ( uint8_t * )FONT_TABLE[37] );/*.*/
GUI_General_Digit_Display(text5[1], Num_15, 2, 0, CurrentDigitNum15PosX_2, 200);
}
}
......
YueJin_test_bench/source/Appliciation/Key_user.c
View file @ a265a6b9
......@@ -151,7 +151,7 @@ void Key_Operation_SW6(Key_Event_en_t enKeyEvent)
All_Flag.u8flag[6] = 1;
Check_Steps = 0;
Study_Flag = 0;
Display_TFT_Clear();
//General_Number_Disp(Flag_SW6_Dis, 200, 20);
......@@ -172,6 +172,7 @@ void Key_Operation_SW7(Key_Event_en_t enKeyEvent)
memset(&All_Flag, 0, sizeof(All_Flag));
All_Flag.u8flag[7] = 1;
Check_Steps = 0;
Study_Flag = 0;
Query_Card_can_command = 1;
Require_card_flag = 1;
//Display_TFT_Clear();
......@@ -198,16 +199,18 @@ void Key_Operation_SW8(Key_Event_en_t enKeyEvent)
memset(canData1, 0, sizeof(canData1));/*清除上次CAN诊断接收的数据*/
memset(canData4, 0, sizeof(canData4));
memset(canData2, 0, sizeof(canData2));
memset(canData3, 0, sizeof(canData3));
Study_Flag = 0;
Diagnosis_banbenhao_flag=1;/*CAN诊断起始信号*/
Display_TFT_Clear();
TFT_LCD_Draw_Bmp(5, 50, ( uint8_t * )gImage_Dyy_words_1X6_Y16 ); //软件版本号
TFT_LCD_Draw_Bmp(5, 100, ( uint8_t * )gImage_Dyy_words_2X6_Y46 ); //硬件版本号
TFT_LCD_Draw_Bmp(0,200 , ( uint8_t * )gImage_Dyy_words_5X6_Y137 ); //静态电流
TFT_LCD_Draw_Bmp(0, 220, ( uint8_t * )gImage_titlex0_y0);
TFT_LCD_Draw_Bmp(5, 200, ( uint8_t * )gImage_Dyy_words_5X6_Y137 ); //静态电流
TFT_LCD_Draw_Bmp(0, 220, ( uint8_t * )gImage_titlex0_y0 );
General_Number_Disp(banbenhao, 90, 230);/*显示检测台版本号*/
Display_Can_Receive_Data(5,50);
//Display_Can_Receive_Data(5,50);
}
......
YueJin_test_bench/source/Appliciation/Task.c
View file @ a265a6b9
......@@ -139,31 +139,8 @@ void Sys_Run_Mode_100ms_Tasks_Group(void)
// POWER_CTRL_KL30_B = 1;
//POWER_CTRL_KL15 = 1;
if(Student_Card_can_command==1)
{
Student_Card++;
}
else
{
Student_Card=0;
}
// if(Student_Card>=6)
// {
// Student_Card=0;
// }
if(Query_Card_can_command==1)
{
Query_Card++;
}
else
{
Query_Card=0;
}
CAN_Msg_Steps_100ms();
Display_Can_Receive_Data(5,50);
Display_interface_learning_card(0,50);
Display_Chaka_Model();//查卡模式
......
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