Commit 7b7b478c authored by 梁百峰's avatar 梁百峰

feat:增加版本号兼容

parent 51ac293e
...@@ -3731,7 +3731,8 @@ void Display_Version_Info(uint32_t ON_OFF) ...@@ -3731,7 +3731,8 @@ void Display_Version_Info(uint32_t ON_OFF)
} }
else if(R485_ID4Dh.Sig.MaterialCode07 == 0x43) else if(R485_ID4Dh.Sig.MaterialCode07 == 0x43)
{ {
if(R485_ID4Dh.Sig.MaterialCode10 == 0x37)
{
if(R485_ID4Dh.Sig.MaterialCode13 == 0x32) if(R485_ID4Dh.Sig.MaterialCode13 == 0x32)
{ {
nowbanbenhao = 2; nowbanbenhao = 2;
...@@ -3742,15 +3743,28 @@ void Display_Version_Info(uint32_t ON_OFF) ...@@ -3742,15 +3743,28 @@ void Display_Version_Info(uint32_t ON_OFF)
else if(R485_ID4Dh.Sig.MaterialCode13 == 0x35) else if(R485_ID4Dh.Sig.MaterialCode13 == 0x35)
{ {
nowbanbenhao = 1; nowbanbenhao = 1;
nowbanbenhaohoumian = 2; nowbanbenhaohoumian = 3;
nowbanbenhaoG031 = 1; nowbanbenhaoG031 = 1;
nowbanbenhaoG031houmian = 2; nowbanbenhaoG031houmian = 3;
} }
else else
{ {
; ;
} }
} }
else if(R485_ID4Dh.Sig.MaterialCode10 == 0x36)
{
nowbanbenhao = 1;
nowbanbenhaohoumian = 1;
nowbanbenhaoG031 = 1;
nowbanbenhaoG031houmian = 1;
}
else
{
}
}
else else
{ {
; ;
...@@ -3800,7 +3814,7 @@ void Display_Version_Info(uint32_t ON_OFF) ...@@ -3800,7 +3814,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((R485_ID4Dh.Sig.ESP322 != 0) && ( R485_ID4Dh.Sig.G0312 != 0)) if((R485_ID4Dh.Sig.ESP322 != 0) && ( R485_ID4Dh.Sig.G0312 != 0))
{ {
if((nowbanbenhao == R485_ID4Dh.Sig.ESP322) && (nowbanbenhaohoumian == R485_ID4Dh.Sig.ESP321) && (nowbanbenhaoG031 == R485_ID4Dh.Sig.G0312) && (nowbanbenhaoG031houmian == R485_ID4Dh.Sig.G0311)) if((nowbanbenhao == R485_ID4Dh.Sig.ESP322) && (nowbanbenhaohoumian == R485_ID4Dh.Sig.ESP321) && (nowbanbenhaoG031 <= R485_ID4Dh.Sig.G0312) && (nowbanbenhaoG031houmian <= R485_ID4Dh.Sig.G0311))
{ {
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;
...@@ -3836,7 +3850,8 @@ void Display_Version_Info(uint32_t ON_OFF) ...@@ -3836,7 +3850,8 @@ 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};
uint8_t mbuff [7] = {0,1,0,5,10,1,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