✨ feat:初步完成版本号

YueJin_test_bench/source/Appliciation/Display_Info.c

@@ -3910,8 +3910,9 @@ uint8_t firstclearflag = 0;
 uint8_t nowbanbenhao = 2;
 uint8_t nowbanbenhaohoumian = 22;
 const uint16_t  banebenhao1[] = {35,25};
-const uint16_t  banebenhao2[] = {190,180};
-const uint16_t  banebenhao3[] = {105,95};
+const uint16_t  banebenhao2[] = {158,148};
+const uint16_t  banebenhao3[] = {95,85};
+const uint16_t  banebenhao4[] = {214,224};
 void Display_Version_Info(uint32_t ON_OFF)
 {
     uint8_t pbuff [ 40 ];
@@ -3944,24 +3945,30 @@ void Display_Version_Info(uint32_t ON_OFF)
 
         TFT_LCD_Draw_Bmp(3,   25,   ( uint8_t * )gImage_Dyy_words_1X6_Y16 );      //软件版本号文字
 
-        //ESP32版本号
-        uint8_t esp32banben[3] = {R485_IDB4h.Sig.ESP32_APP_PV,0x2E,0xff};
-        uint8_t esp32houmian = R485_IDB4h.Sig.ESP32_APP_SV;
+        //杰理7926版本号
+        uint8_t esp32banben[3] = {R485_IDB4h.Sig.Software_Version1,0x2E,0xff};
+        uint8_t esp32houmian = R485_IDB4h.Sig.Software_Version2;
         General_Number_Disp(esp32banben, 5, 50);  
         GUI_General_Digit_Display(esp32houmian, Num_15, 2, 0, banebenhao1, 50);
 
-        //主版本号
-        uint8_t mbuffruanjian[3] = {R485_IDB4h.Sig.Software_Version1,0x2E,0xff};
-        General_Number_Disp(mbuffruanjian, 160, 50);  
-        uint8_t wifihoumian = R485_IDB4h.Sig.Software_Version2;
-        GUI_General_Digit_Display(wifihoumian, Num_15, 2, 0, banebenhao2, 50);
-        
-        //国民软件版本号
+        //普冉MCU版本号
         uint8_t guominbanben[3] = {R485_IDB4h.Sig.G031_APP_PV,0x2E,0xff};
-        General_Number_Disp(guominbanben, 75, 50);                  
+        General_Number_Disp(guominbanben, 65, 50);                  
         uint8_t guominhoumian = R485_IDB4h.Sig.G031_APP_SV;
         GUI_General_Digit_Display(guominhoumian, Num_15, 2, 0, banebenhao3, 50);
 
+        //7106版本号
+        uint8_t mbuffruanjian[3] = {R485_IDB4h.Sig.ESP32_APP_PV,0x2E,0xff};
+        General_Number_Disp(mbuffruanjian, 128, 50);  
+        uint8_t wifihoumian = R485_IDB4h.Sig.ESP32_APP_SV;
+        GUI_General_Digit_Display(wifihoumian, Num_15, 2, 0, banebenhao2, 50);
+
+        //WIFI版本号
+        uint8_t wifiruanjian[3] = {R485_IDB4h.Sig.Whole_package_main,0x2E,0xff};
+        General_Number_Disp(wifiruanjian, 190, 50);  
+        uint8_t wifihoumianbanben = R485_IDB4h.Sig.Whole_package_time;
+        GUI_General_Digit_Display(wifihoumianbanben, Num_15, 2, 0, banebenhao4, 50);
+
         //硬件版本号
         const uint16_t  Currenttest[] = {180,170};
         GUI_General_Digit_Display(R485_IDB4h.Sig.Hardware_Version, Num_15, 2, 0, Currenttest, 50+30);

YueJin_test_bench/source/Appliciation/R485_Communication_Matrix.h

@@ -1168,7 +1168,7 @@ typedef union __attribute__((packed))
         uint8_t SupplierCode03              : 8; //供应商编码第3位
         uint8_t SupplierCode02              : 8; //供应商编码第2位
         uint8_t SupplierCode01              : 8; //供应商编码第1位
-
+        /*40bit*/
         uint8_t                             : 8; //批次号专用预留位
         uint8_t                             : 8; //批次号专用预留位
 
@@ -1190,7 +1190,7 @@ typedef union __attribute__((packed))
 
         uint8_t                             : 8;
         uint8_t                             : 8;
-
+        /*58bit*/
         uint8_t                             : 8; //标定固件次版本信息
         uint8_t                             : 8; //标定固件主版本信息
         uint8_t ESP32_APP_SV                : 8; //系统固件次版本信息
@@ -1207,6 +1207,8 @@ typedef union __attribute__((packed))
         uint8_t Animation_PV                : 8; //开机动画主版本信息
         uint8_t Font_SV                     : 8; //字体库次版本信息
         uint8_t Font_PV                     : 8; //字体库主版本信息
+        uint8_t Whole_package_time          : 8; //字体库次版本信息
+        uint8_t Whole_package_main          : 8; //字体库主版本信息
 
     }Sig;
 } _ID0XB4h_Data;

YueJin_test_bench/source/Appliciation/api_RS485.c

@@ -408,20 +408,20 @@ uint8_t RS485_User_Tx_Data(void)
     switch (RS485_TxControl.sendIndex)
     {
         case RS485_Tx_IDA4_Idx:
-        // if(MENU_CHECK_STEP == 0)
-        // {
-        //     sendfinishflag = R485_Send_0xA4(); 
-        //     RS485_TX_finish = 1;
-        //     if(sendfinishflag == 0)
-        //     {
-        //         RS485_send_time = 0;
-        //         RS485_TxControl.sendIndex ++;
-        //     }
-        // }
-        // else
-        // {
+        if(MENU_CHECK_STEP == 0)
+        {
+            sendfinishflag = R485_Send_0xA4(); 
+            RS485_TX_finish = 1;
+            if(sendfinishflag == 0)
+            {
+                RS485_send_time = 0;
+                RS485_TxControl.sendIndex ++;
+            }
+        }
+        else
+        {
             RS485_TxControl.sendIndex ++;
-        // }
+        }
         break;
 
         case RS485_Tx_IDD0_Idx: