Skip to content

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

✨ feat:更新版本号校验

parent 52881119
Hide whitespace changes
Inline Side-by-side
Showing with 25 additions and 25 deletions
YueJin_test_bench/source/Appliciation/Check_Ctrl.c
View file @ cda7f08d
...@@ -71,8 +71,8 @@ void Function_Check_Ctrl(uint32_t cmd); ...@@ -71,8 +71,8 @@ void Function_Check_Ctrl(uint32_t cmd);
void MENU_CHECK_STEP_ADD(void) void MENU_CHECK_STEP_ADD(void)
{ {
// if(jiaoyan == 1) if(jiaoyan == 1)
// { {
MENU_CHECK_STEP++; MENU_CHECK_STEP++;
if(MENU_CHECK_STEP > 14) if(MENU_CHECK_STEP > 14)
...@@ -87,7 +87,7 @@ void MENU_CHECK_STEP_ADD(void) ...@@ -87,7 +87,7 @@ void MENU_CHECK_STEP_ADD(void)
{ {
MENU_CHECK_STEP = 1; MENU_CHECK_STEP = 1;
} }
// } }
} }
void MENU_CHECK_STEP_SUB(void) void MENU_CHECK_STEP_SUB(void)
......
YueJin_test_bench/source/Appliciation/Display_Info.c
View file @ cda7f08d
...@@ -4865,27 +4865,27 @@ void Display_Version_Info(uint32_t ON_OFF) ...@@ -4865,27 +4865,27 @@ void Display_Version_Info(uint32_t ON_OFF)
} }
TFT_LCD_Draw_Bmp(3, 90+25+25+30+30+30+5, ( uint8_t * )gImage_gImage_LEDwaif1X6_Y16 ); //硬线指示灯外发对比 TFT_LCD_Draw_Bmp(3, 90+25+25+30+30+30+5, ( uint8_t * )gImage_gImage_LEDwaif1X6_Y16 ); //硬线指示灯外发对比
// TFT_LCD_Draw_Bmp(3, 90+25+25+30+25+30+30+5, ( uint8_t * )gImage_gImage_SV1X6_Y16 ); //软件版本号对比
// if((R485_ID4Dh.Sig.ESP322 != 0) && ( R485_ID4Dh.Sig.G0312 != 0))
// {
// if((esp32houmian == 32) && (guominhoumian == 33) && (wifihoumian == 35))
// { TFT_LCD_Draw_Bmp(3, 90+25+25+30+25+30+30+5, ( uint8_t * )gImage_gImage_SV1X6_Y16 ); //软件版本号对比
// TFT_LCD_Draw_Bmp(200, 90+25+25+30+25+30+30, ( uint8_t * )gImage_dui ); //软件版本号对比 对 if((esp32houmian == 14) && (guominhoumian == 14) && (wifihoumian == 37))
// jiaoyan = 1; {
// } TFT_LCD_Draw_Bmp(200, 90+25+25+30+25+30+30, ( uint8_t * )gImage_dui ); //软件版本号对比 对
// else jiaoyan = 1;
// { }
// TFT_LCD_Draw_Bmp(200, 90+25+25+30+25+30+30, ( uint8_t * )gImage_cuo ); //软件版本号对比 错 else
// jiaoyan = 0; {
// //正在调试取消版本号对比 想要取消版本号对比将上方注释掉并解开下方注释即可 TFT_LCD_Draw_Bmp(200, 90+25+25+30+25+30+30, ( uint8_t * )gImage_cuo ); //软件版本号对比 错
// // TFT_LCD_Draw_Bmp(200, 90+25+25+30+25+30+30, ( uint8_t * )gImage_dui ); //软件版本号对比 对 jiaoyan = 0;
// // firstpowerflag = 2; //正在调试取消版本号对比 想要取消版本号对比将上方注释掉并解开下方注释即可
// } // TFT_LCD_Draw_Bmp(200, 90+25+25+30+25+30+30, ( uint8_t * )gImage_dui ); //软件版本号对比 对
// } // firstpowerflag = 2;
// else }
// {
// // MENU_CHECK_STEP = 0;
// }
// TFT_LCD_Draw_Bmp(200, 90+25+25+30+25+25, ( uint8_t * )gImage_cuo ); //软件版本号对比 错 // TFT_LCD_Draw_Bmp(200, 90+25+25+30+25+25, ( uint8_t * )gImage_cuo ); //软件版本号对比 错
// TFT_LCD_Draw_Bmp(3, 90+25+25+25+25+25, ( uint8_t * )gImage_gImage_SV1X6_Y16 ); //支持扫码功能个 // TFT_LCD_Draw_Bmp(3, 90+25+25+25+25+25, ( uint8_t * )gImage_gImage_SV1X6_Y16 ); //支持扫码功能个
// TFT_LCD_Draw_Bmp(3, 130, ( uint8_t * )gImage_Dyy_words_4X6_Y107); //供应商编码 // TFT_LCD_Draw_Bmp(3, 130, ( uint8_t * )gImage_Dyy_words_4X6_Y107); //供应商编码
...@@ -4903,7 +4903,7 @@ void Display_Version_Info(uint32_t ON_OFF) ...@@ -4903,7 +4903,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,0,6,0xff}; uint8_t mbuff [7] = {2,5,1,2,1,6,0xff};
General_Number_Disp(mbuff, 160, 290); General_Number_Disp(mbuff, 160, 290);
} }
......
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