Commit f39181a0 authored by 何锐's avatar 何锐

feat:去掉版本号校验

parent 7ba02730
...@@ -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)
......
...@@ -4890,6 +4890,7 @@ void Display_Version_Info(uint32_t ON_OFF) ...@@ -4890,6 +4890,7 @@ 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)
{ {
jiaoyan = 2;
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))) ((R485_IDB4h.Sig.PY32F072_APP_PV == 1) && (R485_IDB4h.Sig.JL7926_APP_PV == 1) && (R485_IDB4h.Sig.JL7106_APP_PV == 1)))
{ {
...@@ -4899,7 +4900,6 @@ void Display_Version_Info(uint32_t ON_OFF) ...@@ -4899,7 +4900,6 @@ void Display_Version_Info(uint32_t ON_OFF)
else else
{ {
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_cuo ); //软件版本号对比 错
jiaoyan = 0;
//正在调试取消版本号对比 想要取消版本号对比将上方注释掉并解开下方注释即可 //正在调试取消版本号对比 想要取消版本号对比将上方注释掉并解开下方注释即可
// 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 ); //软件版本号对比 对
// firstpowerflag = 2; // firstpowerflag = 2;
...@@ -4925,7 +4925,7 @@ void Display_Version_Info(uint32_t ON_OFF) ...@@ -4925,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,6,0,1,1,6,0xff}; uint8_t mbuff [7] = {2,6,0,1,1,5,0xff};
General_Number_Disp(mbuff, 160, 290); General_Number_Disp(mbuff, 160, 290);
} }
......
...@@ -407,7 +407,7 @@ void EnterVersionNumber(void) ...@@ -407,7 +407,7 @@ void EnterVersionNumber(void)
if(enterdelaytime <= 600) //等待开机动画 if(enterdelaytime <= 600) //等待开机动画
{ {
if(jiaoyan == 1) if((jiaoyan == 1) || (jiaoyan == 2))
{ {
if(entermenutime <= 200) if(entermenutime <= 200)
{ {
......
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