Skip to content

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

✨ feat:更新5寸版本号

parent 01cfbfa6
Show whitespace changes
Inline Side-by-side
Showing with 10 additions and 9 deletions
YueJin_test_bench/source/Appliciation/Display_Info.c
View file @ d00fb14f
...@@ -4828,9 +4828,9 @@ void Display_Version_Info(uint32_t ON_OFF) ...@@ -4828,9 +4828,9 @@ void Display_Version_Info(uint32_t ON_OFF)
} }
else if((wuliao[12] == 0x33) || (wuliao[12] == 0x34)) //5寸 else if((wuliao[12] == 0x33) || (wuliao[12] == 0x34)) //5寸
{ {
nowpuran = 37; nowpuran = 41;
now7926 = 37; now7926 = 41;
now7106 = 37; now7106 = 41;
up_key_press_number = 2; up_key_press_number = 2;
} }
...@@ -4890,7 +4890,8 @@ void Display_Version_Info(uint32_t ON_OFF) ...@@ -4890,7 +4890,8 @@ void Display_Version_Info(uint32_t ON_OFF)
TFT_LCD_Draw_Bmp(3, 90+25+25+30+25+30+30+5, ( uint8_t * )gImage_gImage_SV1X6_Y16 ); //软件版本号对比 TFT_LCD_Draw_Bmp(3, 90+25+25+30+25+30+30+5, ( uint8_t * )gImage_gImage_SV1X6_Y16 ); //软件版本号对比
if((puranhoumian + houmian7926 + houmian7106) != 0) if((puranhoumian + houmian7926 + houmian7106) != 0)
{ {
if((puranhoumian == nowpuran) && (houmian7926 == now7926) && (houmian7106 == now7106)) if((puranhoumian == nowpuran) && (houmian7926 == now7926) && (houmian7106 == now7106) && \
((R485_IDB4h.Sig.PY32F072_APP_PV == 1) && (R485_IDB4h.Sig.JL7926_APP_PV == 1) && (R485_IDB4h.Sig.JL7106_APP_PV == 1)))
{ {
TFT_LCD_Draw_Bmp(200, 90+25+25+30+25+30+30, ( uint8_t * )gImage_dui ); //软件版本号对比 对 TFT_LCD_Draw_Bmp(200, 90+25+25+30+25+30+30, ( uint8_t * )gImage_dui ); //软件版本号对比 对
jiaoyan = 1; jiaoyan = 1;
...@@ -4924,7 +4925,7 @@ void Display_Version_Info(uint32_t ON_OFF) ...@@ -4924,7 +4925,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 [7] = {2,5,1,2,2,9,0xff}; uint8_t mbuff [7] = {2,6,0,1,0,5,0xff};
General_Number_Disp(mbuff, 160, 290); General_Number_Disp(mbuff, 160, 290);
} }
......
YueJin_test_bench/source/System/init.c
View file @ d00fb14f
...@@ -126,12 +126,12 @@ void Sys_Startup_Init(void) ...@@ -126,12 +126,12 @@ void Sys_Startup_Init(void)
EN_5V_CUT_ENABLE = 1; EN_5V_CUT_ENABLE = 1;
// Display_TFT_Clear(); Display_TFT_Clear();
// GUI_Display_Version_Code_Service(25, 20, "Please Scan The Code ", Letter_Num_11, PCodeText_Space_size); GUI_Display_Version_Code_Service(25, 20, "Please Scan The Code ", Letter_Num_11, PCodeText_Space_size);
/*上电扫码校验功能如果需要扫码校验注释掉firstpowerflag = 2，saomafinish = 3;打开上面两行的注释即可*/ /*上电扫码校验功能如果需要扫码校验注释掉firstpowerflag = 2，saomafinish = 3;打开上面两行的注释即可*/
firstpowerflag = 2; // firstpowerflag = 2;
saomafinish = 4; // saomafinish = 4;
} }
/*********************************************************************** /***********************************************************************
......
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