Commit ebcaf57c authored by 何锐's avatar 何锐

feat:优化版本号显示

parent a40a5b7a
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
#define SWTIME_READ_ORDER2 0x28 #define SWTIME_READ_ORDER2 0x28
//零件号长度 //零件号长度
#define PN_Length 20 #define PN_Length 12
CAN_Frame_st_t m_msg1; CAN_Frame_st_t m_msg1;
CAN_Frame_st_t m_msg2; CAN_Frame_st_t m_msg2;
...@@ -666,10 +666,10 @@ uint8_t MCU_PartNumbers_Get(void) ...@@ -666,10 +666,10 @@ uint8_t MCU_PartNumbers_Get(void)
{ {
for(int i = 0; i < 7; i++) for(int i = 0; i < 7; i++)
{ {
if(UDS_MMessage_Get[i + 1] == 0xAA) if((UDS_MMessage_Get[i + 1] == 0xAA) || (UDS_MMessage_Get[i + 1] == 0x00))
{ {
lingjianhao[PN_Length] = 0xFF; lingjianhao[PN_Length] = 0xFF;
General_Number_Disp(lingjianhao, 135, 125); General_Number_Disp(lingjianhao, 70, 100);
UDS_STEP = TIME_READ; UDS_STEP = TIME_READ;
break; break;
} }
...@@ -760,7 +760,7 @@ void SWINNotApplied(void) ...@@ -760,7 +760,7 @@ void SWINNotApplied(void)
void HWINNotApplied(void) void HWINNotApplied(void)
{ {
UDS_STEP++; UDS_STEP++;
TFT_LCD_Draw_Bmp(135, 100, ( uint8_t * )ForkDisplay);//显示×,不应用此功能 // TFT_LCD_Draw_Bmp(135, 100, ( uint8_t * )ForkDisplay);//显示×,不应用此功能
} }
void PNNotApplied(void) void PNNotApplied(void)
{ {
......
...@@ -4282,7 +4282,7 @@ void Display_Version_Info(uint32_t ON_OFF) ...@@ -4282,7 +4282,7 @@ void Display_Version_Info(uint32_t ON_OFF)
// TFT_LCD_Draw_Bmp(3, 160, ( uint8_t * )gImage_Alarm_12_WordX6_Y165); //24脚输出占空比 // TFT_LCD_Draw_Bmp(3, 160, ( uint8_t * )gImage_Alarm_12_WordX6_Y165); //24脚输出占空比
// TFT_LCD_Draw_Bmp(210, 160, ( uint8_t * )gImage_Alarm_13_ImageX222_Y166); //% // TFT_LCD_Draw_Bmp(210, 160, ( uint8_t * )gImage_Alarm_13_ImageX222_Y166); //%
// TFT_LCD_Draw_Bmp(3, 290, ( uint8_t * )gImage_gImage_checkVX6_Y165 ); //检测台版本号 // TFT_LCD_Draw_Bmp(3, 290, ( uint8_t * )gImage_gImage_checkVX6_Y165 ); //检测台版本号
uint8_t mbuff [10] = {2,0,2,6,97,0,2,1,1,0xff}; uint8_t mbuff [10] = {2,0,2,6,97,0,3,0,6,0xff};
General_Number_Disp(mbuff, 115, 200); //检测台版本号 General_Number_Disp(mbuff, 115, 200); //检测台版本号
// General_Number_Disp(UIDNumber, 85, 120); //固定UID数字 // General_Number_Disp(UIDNumber, 85, 120); //固定UID数字
// General_Number_Disp(UIDNumber2, 70, 146); //可调UID数字 // General_Number_Disp(UIDNumber2, 70, 146); //可调UID数字
...@@ -4292,8 +4292,8 @@ void Display_Version_Info(uint32_t ON_OFF) ...@@ -4292,8 +4292,8 @@ void Display_Version_Info(uint32_t ON_OFF)
TFT_LCD_Draw_Bmp(3, 25, ( uint8_t * )gImage_pic_01X0_Y0); //外部软件版本号 TFT_LCD_Draw_Bmp(3, 25, ( uint8_t * )gImage_pic_01X0_Y0); //外部软件版本号
TFT_LCD_Draw_Bmp(3, 50, ( uint8_t * )gImage_pic_03X0_Y0); //外部硬件版本号 TFT_LCD_Draw_Bmp(3, 50, ( uint8_t * )gImage_pic_03X0_Y0); //外部硬件版本号
TFT_LCD_Draw_Bmp(3, 75, ( uint8_t * )gImage_pic_02X0_Y0); //软件内部版本号 TFT_LCD_Draw_Bmp(3, 75, ( uint8_t * )gImage_pic_02X0_Y0); //软件内部版本号
TFT_LCD_Draw_Bmp(3, 100, ( uint8_t * )gImage_pic_04X0_Y0); //硬件内部版本号 // TFT_LCD_Draw_Bmp(3, 100, ( uint8_t * )gImage_pic_04X0_Y0); //硬件内部版本号
TFT_LCD_Draw_Bmp(3, 125, ( uint8_t * )gImage_pic_05X0_Y0); //零件号 TFT_LCD_Draw_Bmp(3, 100, ( uint8_t * )gImage_pic_05X0_Y0); //零件号
TFT_LCD_Draw_Bmp(3, 175, ( uint8_t * )gImage_JCT_25X0_Y0); //时间 TFT_LCD_Draw_Bmp(3, 175, ( uint8_t * )gImage_JCT_25X0_Y0); //时间
} }
......
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