✨ feat:增加光感显示与uboot版本号显示

YueJin_test_bench/source/Appliciation/Barcode_Scanner.c

@@ -53,6 +53,8 @@ uint8_t btmac[6];
 uint8_t firstpowerflag = 0;
 uint16_t lightnumber = 0;
 uint8_t writeflag = 0;
+uint8_t UbootMajor;
+uint8_t UbootMinor;
 void get_key(void)
 {
     key_array[0] = seed_value[0] | seed_value[3];
@@ -179,6 +181,8 @@ void datacheck(void)
                             blename[4] = 0xff;
                             lightnumber = (RS485_data[12]<<8)+RS485_data[11];
                             writeflag = RS485_data[13];
+                            UbootMajor = RS485_data[14];
+                            UbootMinor = RS485_data[15];
                         }
                         
                         // General_Number_Disp(blename, 3, 165); 

YueJin_test_bench/source/Appliciation/Barcode_Scanner.h

@@ -11,6 +11,8 @@ void Recv_Byte(void);
 void Recv_Byte1(void);
 void Recv_Byte2(void);
 extern uint8_t GetDataCompare(void);
+extern uint8_t UbootMajor;
+extern uint8_t UbootMinor;
 extern uint32_t readNum;
 extern uint8_t  BarCode[256];
 extern uint32_t readNum1;

YueJin_test_bench/source/Appliciation/Display_Info.c

@@ -20,6 +20,7 @@ uint16_t Fuel_Res;
 uint32_t loc_Current_0 = 0;
 const unsigned char gImage_cuo11[] = {24, 24,0X00,0X00,0X00,0X00,0X30,0X70,0XE0,0XC0,0X80,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X80,0XC0,0X70,0X30,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X01,0X83,0XC7,0X66,0X38,0X38,0X7C,0XE6,0XC3,0X81,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X0C,0X0C,0X06,0X03,0X01,0X00,0X00,0X00,0X00,0X00,0X00,0X01,0X03,0X07,0X0E,0X0C,0X00,0X00,0X00,0X00,};
 const unsigned char gImage_dui11[] = {24, 24,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X80,0XC0,0XE0,0X40,0X00,0X00,0X00,0X00,0X08,0X18,0X30,0X70,0XC0,0X80,0X00,0X00,0X80,0XC0,0XE0,0X70,0X38,0X1C,0X0E,0X07,0X03,0X01,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X01,0X03,0X07,0X03,0X01,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,};
+const uint16_t ODODigitNum09PosXlight []              = {220,210,200,190,180,170};
 //const uint16_t BackLightDigitNum09PosX[] = {30*9, 30*8, 30*7, 30*6, 30*5, 30*4, 30*3, 30*2, 30*1, 30*0};
 //坐垫感应功能开启
 const unsigned char gImage_icon_01X16_Y16[]={/*Byte Size834*/
@@ -4781,10 +4782,18 @@ void Display_Version_Info(uint32_t ON_OFF)
         General_Number_Disp(wifiruanjian, 190, 50);  
         GUI_General_Digit_Display(wifihoumianbanben, Num_15, 2, 0, banebenhao4, 50);
 
+        //nboot版本号
+        uint8_t ubootqianmian[3] = {UbootMajor,0x2E,0xff};
+        uint8_t uboothoumianbanben = UbootMinor;
+        General_Number_Disp(ubootqianmian, 190, 25);  
+        GUI_General_Digit_Display(uboothoumianbanben, Num_15, 2, 0, banebenhao4, 25);
+
         //硬件版本号
-        const uint16_t  Currenttest[] = {180,170};
+        const uint16_t  Currenttest[] = {130,120};
         GUI_General_Digit_Display(R485_IDB4h.Sig.Hardware_Version, Num_15, 2, 0, Currenttest, 50+30);
 
+        //光感显示
+        GUI_General_Digit_Display(lightnumber, Num_15, 6, 5, ODODigitNum09PosXlight, 80);
 
         uint8_t wuliao[16];
 
@@ -4914,7 +4923,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(210,   160,  ( uint8_t * )gImage_Alarm_13_ImageX222_Y166);  //%
         TFT_LCD_Draw_Bmp(3,   290,  ( uint8_t * )gImage_gImage_checkVX6_Y165 );      //检测台版本号
-        uint8_t mbuff [7] = {2,5,1,2,1,1,0xff};
+        uint8_t mbuff [7] = {2,5,1,2,1,9,0xff};
         General_Number_Disp(mbuff, 160, 290);  
 
     }