✨ feat:增加一键读取版本号功能，增加外部版本号，修改内部版本号

YueJin_test_bench/source/Appliciation/CAN_APP.c

@@ -7,7 +7,6 @@
 #include "Check_Ctrl.h"
 #include "Display_Info.h"
 #include "RTE_GPIO.h"
-extern uint8_t cycleflag;
 const uint8_t crc8_table[256] = {
     0x00, 0x1D, 0x3A, 0x27, 0x74, 0x69, 0x4E, 0x53, 0xE8, 0xF5, 0xD2, 0xCF, 0x9C, 0x81, 0xA6, 0xBB,
     0xCD, 0xD0, 0xF7, 0xEA, 0xB9, 0xA4, 0x83, 0x9E, 0x25, 0x38, 0x1F, 0x02, 0x51, 0x4C, 0x6B, 0x76,
@@ -833,6 +832,21 @@ void can_submit(void)
         // can_mid(m_msg7);
     }
 }
+void UID_ADD(void)
+{
+    for(uint8_t i = 13; i > 1; i--)
+    {
+        if(UIDNumber2[i] < 9)
+        {
+            UIDNumber2[i] += 1;
+            return;
+        }
+        else
+        {
+            UIDNumber2[i] = 0;
+        }
+    }
+}
 uint8_t u8get714msg[8];
 uint8_t u8getSWmsg[8];
 uint8_t u8getUIDmsg[8];
@@ -841,6 +855,7 @@ uint8_t HWtestresult = 0;
 uint8_t PNtestresult = 0;
 uint8_t ruanjianbanbenhao[8];
 uint8_t yingjianbanbenhao[8];
+uint8_t ruanjianbanbenhaoin[5];
 uint8_t lingjianhao[21];
 uint8_t UIDcode1[33];
 uint8_t UIDcode2[33];
@@ -848,11 +863,10 @@ uint8_t zhenduanstep = 0;
 void Get_SW_msg(void);
 void Get_HW_msg(void);
 void Get_PN_msg(void);
-extern uint8_t getmsgfinish;
 extern uint32_t send0x714time;
-uint8_t readstopflag;
 uint8_t begin714;
 uint8_t UIDdelay;
+uint8_t SWINtestresult;
 void send_0x714_fuc()
 {
 
@@ -861,8 +875,6 @@ void send_0x714_fuc()
 
     if(MENU_CHECK_STEP != 0)
     {
-        SWtestresult = 0;
-        HWtestresult = 0;
         PNtestresult = 0;
     }
     switch (zhenduanstep)
@@ -900,6 +912,7 @@ void send_0x714_fuc()
             init_CAN_Frame(&m_msg7, 0x7A1, 8, 1, data7); 
             can_mid(m_msg7);
             zhenduanstep++;
+            SWtestresult = 1;
             Get_SW_msg();
             break;
         case 2:
@@ -947,6 +960,8 @@ void send_0x714_fuc()
             data7[7] = 0xAA;
             init_CAN_Frame(&m_msg7, 0x7A1, 8, 1, data7); 
             can_mid(m_msg7);
+            HWtestresult = 1;
+            Get_HW_msg();
             zhenduanstep++;
             break;
         case 7:
@@ -966,9 +981,39 @@ void send_0x714_fuc()
             break;
         case 8:
             Get_PN_msg();
+            data7[0] = 0x03;
+            data7[1] = 0x22;
+            data7[2] = 0x20;
+            data7[3] = 0x24;
+            data7[4] = 0xAA;
+            data7[5] = 0xAA;
+            data7[6] = 0xAA;
+            data7[7] = 0xAA;
+            init_CAN_Frame(&m_msg7, 0x7A1, 8, 1, data7); 
+            can_mid(m_msg7);
+            SWINtestresult = 1;
             zhenduanstep++;
             break;
-        case 9:     //读取UID
+        case 9:
+            Get_SWIN_msg();
+            data7[0] = 0x30;
+            data7[1] = 0x00;
+            data7[2] = 0x00;
+            data7[3] = 0xAA;
+            data7[4] = 0xAA;
+            data7[5] = 0xAA;
+            data7[6] = 0xAA;
+            data7[7] = 0xAA;
+            init_CAN_Frame(&m_msg7, 0x7A1, 8, 1, data7); 
+            can_mid(m_msg7);
+            zhenduanstep++;
+            Get_SWIN_msg();
+            break;
+        case 10:
+            Get_SWIN_msg();
+            zhenduanstep++;
+            break;
+        case 11:     //读取UID
             if(writeflag == 0)
             {
                 data7[0] = 0x03;
@@ -983,12 +1028,8 @@ void send_0x714_fuc()
                 can_mid(m_msg7);
                 zhenduanstep++;
             }
-            else
-            {
-                readstopflag = 1;
-            }
             break;
-        case 10:
+        case 12:
             if(writeflag == 0)
             {
                 Get_UID_msg();
@@ -1004,33 +1045,10 @@ void send_0x714_fuc()
                 can_mid(m_msg7);
                 Get_UID_msg();
             }
-            else
-            {
-                readstopflag = 1;
-            }
             zhenduanstep++;
             break;
-        // case 11:
-        //     if(UIDresult == 5)
-        //     {
-        //         data7[0] = 0x02;
-        //         data7[1] = 0x3E;
-        //         data7[2] = 0x00;
-        //         data7[3] = 0xAA;
-        //         data7[4] = 0xAA;
-        //         data7[5] = 0xAA;
-        //         data7[6] = 0xAA;
-        //         data7[7] = 0xAA;
-        //         init_CAN_Frame(&m_msg7, 0x7A1, 8, 1, data7); 
-        //         can_mid(m_msg7);
-        //         UIDresult = 6;
-        //         Get_UID_msg();
-        //     }
         default:
-        // zhenduanstep = 0;
-        // cycleflag = 0;
-        // getmsgfinish = 1;
-        send0x714time = 0;
+        zhenduanstep = 11;
         begin714 = 1;
         break;
     }
@@ -1041,7 +1059,6 @@ uint8_t UIDNumber2[15] = {0,5,2,2,0,0,0,0,0,0,0,0,0,0,0xFF};
 uint8_t change = 13;
 uint8_t writeflag = 0;
 uint8_t UIDStep;
-uint8_t UIDTime;
 uint8_t seedresult[4] = {0};
 void get_seed_msg(void);
 uint8_t getseedresult = 0;
@@ -1190,13 +1207,14 @@ void UIDWrite(void)
             data8[7] = 0xAA;
             init_CAN_Frame(&m_msg8, 0x7A1, 8, 1, data8); 
             can_mid(m_msg8);
+            UID_ADD();
             UIDStep++;
             break;
         default:
-                UIDTime = 0;
-                zhenduanstep = 9;
             writeflag = 0;
             begin714 = 0;
+            UIDStep = 0;
+            writebeing = 1;
             UIDresult = 0;
             break;
     }
@@ -1208,12 +1226,30 @@ void Get_ID_0x794_Msg(void)
 
 void Get_SW_msg(void)
 {
-    if(SWtestresult == 1)
+    u8getSWmsg[0] = Get_CAN_CH0_ID_7A9_byte0_Sig();
+    u8getSWmsg[1] = Get_CAN_CH0_ID_7A9_byte1_Sig();
+    u8getSWmsg[2] = Get_CAN_CH0_ID_7A9_byte2_Sig();
+    u8getSWmsg[3] = Get_CAN_CH0_ID_7A9_byte3_Sig();
+    u8getSWmsg[4] = Get_CAN_CH0_ID_7A9_byte4_Sig();
+    u8getSWmsg[5] = Get_CAN_CH0_ID_7A9_byte5_Sig();
+    u8getSWmsg[6] = Get_CAN_CH0_ID_7A9_byte6_Sig();
+    u8getSWmsg[7] = Get_CAN_CH0_ID_7A9_byte7_Sig();
+
+    if(u8getSWmsg[0] == 0x21)
     {
-        return ;
+        ruanjianbanbenhao[0] = u8getSWmsg[1] / 10;
+        ruanjianbanbenhao[1] = u8getSWmsg[1] % 10;
+        ruanjianbanbenhao[2] = u8getSWmsg[2];
+        ruanjianbanbenhao[3] =  u8getSWmsg[3] / 10;
+        ruanjianbanbenhao[4] =  u8getSWmsg[3] % 10;
+        ruanjianbanbenhao[5] = 0xFF;
+        SWtestresult = 0;
+        General_Number_Disp(ruanjianbanbenhao, 135, 50);  
     }
-    if(zhenduanstep == 2)
-    {
+}
+
+void Get_SWIN_msg(void)
+{
     u8getSWmsg[0] = Get_CAN_CH0_ID_7A9_byte0_Sig();
     u8getSWmsg[1] = Get_CAN_CH0_ID_7A9_byte1_Sig();
     u8getSWmsg[2] = Get_CAN_CH0_ID_7A9_byte2_Sig();
@@ -1222,24 +1258,25 @@ void Get_SW_msg(void)
     u8getSWmsg[5] = Get_CAN_CH0_ID_7A9_byte5_Sig();
     u8getSWmsg[6] = Get_CAN_CH0_ID_7A9_byte6_Sig();
     u8getSWmsg[7] = Get_CAN_CH0_ID_7A9_byte7_Sig();
-    }
 
-    if(u8getSWmsg[0] == 0x21 && zhenduanstep == 2)
+    if((u8getSWmsg[0] == 0x10) && (zhenduanstep == 9))
     {
-        memcpy(ruanjianbanbenhao,&u8getSWmsg[1],7);
-        ruanjianbanbenhao[7] = 0xFF;
-        SWtestresult = 1;
-        General_Number_Disp(ruanjianbanbenhao, 105, 50);  
-    }
+        ruanjianbanbenhaoin[0] = u8getSWmsg[7];
 
+    }
+    else if(u8getSWmsg[0] == 0x21)
+    {
+        ruanjianbanbenhaoin[1] = u8getSWmsg[1];
+        ruanjianbanbenhaoin[2] = u8getSWmsg[2];
+        ruanjianbanbenhaoin[3] = u8getSWmsg[3];
+        ruanjianbanbenhaoin[4] = 0xFF;
+        General_Number_Disp(ruanjianbanbenhaoin, 135, 75);  
+        SWINtestresult = 0;
+    }
 }
 
 void Get_HW_msg(void)
 {
-    if(HWtestresult == 1)
-    {
-        return ;
-    }
     u8get714msg[0] = Get_CAN_CH0_ID_7A9_byte0_Sig();
     u8get714msg[1] = Get_CAN_CH0_ID_7A9_byte1_Sig();
     u8get714msg[2] = Get_CAN_CH0_ID_7A9_byte2_Sig();
@@ -1248,23 +1285,18 @@ void Get_HW_msg(void)
     u8get714msg[5] = Get_CAN_CH0_ID_7A9_byte5_Sig();
     u8get714msg[6] = Get_CAN_CH0_ID_7A9_byte6_Sig();
     u8get714msg[7] = Get_CAN_CH0_ID_7A9_byte7_Sig();
-    if(u8get714msg[0] == 0x21 && zhenduanstep == 5)
+    if(u8get714msg[0] == 0x21)
     {
         memcpy(yingjianbanbenhao,&u8get714msg[1],7);
         yingjianbanbenhao[7] = 0xFF;
-        HWtestresult = 1;
-        General_Number_Disp(yingjianbanbenhao, 105, 75);  
-        HWtestresult = 1;
+        HWtestresult = 0;
+        General_Number_Disp(yingjianbanbenhao, 100, 100);  
     }
     
 }
 uint8_t PNresult = 0;
 void Get_PN_msg(void)
 {
-    if(PNtestresult == 1)
-    {
-        return ;
-    }
     u8get714msg[0] = Get_CAN_CH0_ID_7A9_byte0_Sig();
     u8get714msg[1] = Get_CAN_CH0_ID_7A9_byte1_Sig();
     u8get714msg[2] = Get_CAN_CH0_ID_7A9_byte2_Sig();
@@ -1322,7 +1354,7 @@ void Get_UID_msg(void)
     u8get714msg[7] = Get_CAN_CH0_ID_7A9_byte7_Sig();
     if((u8get714msg[0] == 0x10) && (u8get714msg[4] == 0x01) && (UIDresult == 0))
     {
-        memset(UIDcode1,0xFF,sizeof(UIDcode1));
+        // memset(UIDcode1,0xFF,sizeof(UIDcode1));
         // memcpy(UIDcode1,&u8get714msg[1],32);
         UIDcode1[0] = u8get714msg[5];
         UIDcode1[1] = u8get714msg[6];
@@ -1377,70 +1409,13 @@ void Get_UID_msg(void)
     {
         UIDcode1[31] = u8get714msg[1];
         UIDcode1[32] = 0xFF;
-        // for(int i = 0;i<33;i++)
-        // {
-        //     if(UIDcode2[i] != UIDcode1[i])
-        //     {
         UIDresult = 6;
         if(writebeing)
         {
             General_Number_Disp(UIDcode1, 95, 225);
             writebeing = 0;
         }
-
-        if(UIDNumber2[13] < 9)
-        {
-            UIDNumber2[13]++;
-        }
-        else
-        {
-            UIDNumber2[13] = 0;
-            if(UIDNumber2[12] < 9)
-            {
-                UIDNumber2[12]++;
-            }
-            else
-            {
-                UIDNumber2[12] = 0;
-                if(UIDNumber2[11] < 9)
-                {
-                    UIDNumber2[11]++;
-                }
-                else
-                {
-                    UIDNumber2[11] = 0;
-                    if(UIDNumber2[10] < 9)
-                    {
-                        UIDNumber2[10]++;
-                    }
-                    else
-                    {
-                        UIDNumber2[10] = 0;
-                        if(UIDNumber2[9] < 9)
-                        {
-                            UIDNumber2[9]++;
-                        }
-                        else
-                        {
-                            UIDNumber2[9] = 0;
-                        }
-                    }
-                }
-            }
     }
-        //     }
-        // }
-        // for(int i = 0;i<33;i++)
-        // {
-        //     UIDcode2[i] = UIDcode1[i];
-        // }
-        // UIDresult = 6;
-        // zhenduanstep = 12;
-    }
-    // else if((u8get714msg[0] == 0x02) && (UIDresult == 6))
-    // {
-    //     zhenduanstep = 9;
-    // }
 }
 
 
@@ -1541,7 +1516,6 @@ uint8_t seednum[4] = {0};
 uint32_t UDS_time = 0;
 extern uint32_t fakedelay;
 uint8_t resettime = 0;
-uint8_t resetflag = 0;
 extern uint32_t fakedelay;
 uint32_t resetpowtime = 0;
 uint32_t FUresetpowtime = 0;

YueJin_test_bench/source/Appliciation/CAN_APP.h

@@ -55,6 +55,9 @@ void change_UDS_DID(void);
 void resetchangeUDSfuc(void);
 void resetpowerfuel(void);
 void UIDWrite(void);
+extern void Get_SW_msg(void);
+extern void Get_SWIN_msg(void);
+extern void Get_HW_msg(void);
 extern uint8_t UIDcode1[33];
 extern uint8_t UIDcode2[33];
 extern uint8_t UIDNumber[19];
@@ -62,11 +65,12 @@ extern uint8_t change;
 extern uint8_t localNum;
 extern uint8_t zhenduanstep;
 extern uint8_t UIDStep;
-extern uint8_t readstopflag;
-extern uint8_t UIDStep;
 extern uint8_t begin714;
 extern uint8_t UIDresult;
 extern uint8_t writebeing;
 extern uint8_t u8get714msg[8];
 extern uint8_t UIDdelay;
+extern uint8_t SWINtestresult;
+extern uint8_t SWtestresult;
+extern uint8_t HWtestresult;
 #endif

YueJin_test_bench/source/Appliciation/Check_Ctrl.c

@@ -557,7 +557,6 @@ void Read_IPK_Session_Type(void)//请求仪表发送 软硬件版本号 等数
     }
 }
 uint8_t LED_Waring = 0;
-extern uint8_t resetflag;
 void Function_Check_Ctrl(uint32_t cmd)
 {
     uint8_t         p [ 20 ];
@@ -582,11 +581,6 @@ void Function_Check_Ctrl(uint32_t cmd)
         {
             case 0:       
             {   
-                if(resetflag == 0)
-                {
-                    // POWER_CTRL_KL30   = 1u;  //B+
-                    // POWER_CTRL_KL15   = 1u;  //KL15
-                }
 
 
                 /*负控*/

YueJin_test_bench/source/Appliciation/Display_Info.c

@@ -105,6 +105,42 @@ const unsigned char gImage_Dyy_words_13X0_Y0[]={/*Byte Size122*/
 0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X40U,0X70U,0X3eU,0X1fU,0X07U,0X5eU,
 0X5cU,0X47U,0X7fU,0X7fU,0X7bU,0X7fU,0X6fU,0X67U,0X60U,0X60U,0X7fU,0X7fU,0X3fU,0X3fU,0X17U,0X1fU,
 0XffU,0X7fU,0X25U,0X25U,0X7fU,0X7fU,0X07U,0X03U,};
+const unsigned char gImage_pic_01X0_Y01[]={/*Byte Size242*/
+120U,16U,
+0X00U,0X00U,0Xc0U,0X20U,0X9eU,0X09U,0X08U,0Xc8U,0X38U,0X00U,0X00U,0XffU,0X40U,0X80U,0X80U,0X00U,
+0X00U,0X00U,0X88U,0X88U,0Xa8U,0X89U,0X8eU,0Xc8U,0Xa8U,0X88U,0X00U,0XfeU,0X02U,0Xc2U,0X3aU,0X06U,
+0X00U,0X08U,0Xc8U,0Xb8U,0X8eU,0Xe8U,0X88U,0X88U,0Xa8U,0X20U,0X1eU,0X09U,0Xe8U,0X08U,0X08U,0X68U,
+0X18U,0X00U,0Xc0U,0X20U,0Xf0U,0X0eU,0X81U,0X60U,0X1eU,0X10U,0X10U,0XfeU,0X10U,0X10U,0X10U,0X10U,
+0X00U,0X00U,0X00U,0XfeU,0X20U,0X3fU,0X20U,0X20U,0X00U,0XfeU,0X22U,0Xe2U,0X22U,0X22U,0X21U,0Xe1U,
+0X01U,0X10U,0X10U,0X10U,0X10U,0X90U,0X50U,0X30U,0XffU,0X30U,0X50U,0X90U,0X10U,0X10U,0X10U,0X10U,
+0X00U,0X00U,0X40U,0X40U,0X5eU,0X52U,0Xd2U,0X52U,0X52U,0X52U,0X52U,0X52U,0X52U,0X5eU,0X40U,0X40U,
+0X00U,0X00U,0X00U,0X00U,0X00U,0X40U,0X00U,0X00U,0X00U,0X00U,0X40U,0X20U,0X10U,0X09U,0X06U,0X01U,
+0X00U,0X00U,0X00U,0X7fU,0X00U,0X00U,0X00U,0X01U,0X02U,0X00U,0X00U,0X7eU,0X22U,0X22U,0X22U,0X22U,
+0X22U,0X7eU,0X00U,0X7fU,0X00U,0X10U,0X11U,0X0eU,0X00U,0X08U,0X08U,0X08U,0X08U,0X7fU,0X04U,0X04U,
+0X44U,0X20U,0X10U,0X0eU,0X01U,0X06U,0X18U,0X20U,0X40U,0X00U,0X00U,0X00U,0XffU,0X00U,0X02U,0X02U,
+0X02U,0X02U,0X02U,0XffU,0X02U,0X02U,0X02U,0X02U,0X02U,0X00U,0X70U,0X0fU,0X01U,0X01U,0X7fU,0X00U,
+0X30U,0X0fU,0X40U,0X21U,0X16U,0X18U,0X26U,0X41U,0X40U,0X10U,0X08U,0X04U,0X02U,0X09U,0X08U,0X08U,
+0X7fU,0X08U,0X08U,0X09U,0X02U,0X04U,0X08U,0X10U,0X00U,0X00U,0X00U,0X00U,0X00U,0X03U,0X02U,0X02U,
+0X22U,0X42U,0X42U,0X42U,0X3aU,0X06U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X20U,0X00U,0X00U,
+};
+const unsigned char gImage_pic_02X0_Y02[]={/*Byte Size242*/
+120U,16U,
+0X00U,0X00U,0Xf8U,0X08U,0X08U,0X08U,0X08U,0X08U,0Xc8U,0X7fU,0X88U,0X08U,0X08U,0X08U,0X08U,0Xf8U,
+0X00U,0X00U,0X88U,0X88U,0Xa8U,0X89U,0X8eU,0Xc8U,0Xa8U,0X88U,0X00U,0XfeU,0X02U,0Xc2U,0X3aU,0X06U,
+0X00U,0X08U,0Xc8U,0Xb8U,0X8eU,0Xe8U,0X88U,0X88U,0Xa8U,0X20U,0X1eU,0X09U,0Xe8U,0X08U,0X08U,0X68U,
+0X18U,0X00U,0Xc0U,0X20U,0Xf0U,0X0eU,0X81U,0X60U,0X1eU,0X10U,0X10U,0XfeU,0X10U,0X10U,0X10U,0X10U,
+0X00U,0X00U,0X00U,0XfeU,0X20U,0X3fU,0X20U,0X20U,0X00U,0XfeU,0X22U,0Xe2U,0X22U,0X22U,0X21U,0Xe1U,
+0X01U,0X10U,0X10U,0X10U,0X10U,0X90U,0X50U,0X30U,0XffU,0X30U,0X50U,0X90U,0X10U,0X10U,0X10U,0X10U,
+0X00U,0X00U,0X40U,0X40U,0X5eU,0X52U,0Xd2U,0X52U,0X52U,0X52U,0X52U,0X52U,0X52U,0X5eU,0X40U,0X40U,
+0X00U,0X00U,0X00U,0X00U,0X00U,0X40U,0X00U,0X00U,0X00U,0X00U,0X7fU,0X00U,0X04U,0X04U,0X02U,0X01U,
+0X00U,0X00U,0X00U,0X01U,0X42U,0X44U,0X40U,0X3fU,0X00U,0X00U,0X00U,0X7eU,0X22U,0X22U,0X22U,0X22U,
+0X22U,0X7eU,0X00U,0X7fU,0X00U,0X10U,0X11U,0X0eU,0X00U,0X08U,0X08U,0X08U,0X08U,0X7fU,0X04U,0X04U,
+0X44U,0X20U,0X10U,0X0eU,0X01U,0X06U,0X18U,0X20U,0X40U,0X00U,0X00U,0X00U,0XffU,0X00U,0X02U,0X02U,
+0X02U,0X02U,0X02U,0XffU,0X02U,0X02U,0X02U,0X02U,0X02U,0X00U,0X70U,0X0fU,0X01U,0X01U,0X7fU,0X00U,
+0X30U,0X0fU,0X40U,0X21U,0X16U,0X18U,0X26U,0X41U,0X40U,0X10U,0X08U,0X04U,0X02U,0X09U,0X08U,0X08U,
+0X7fU,0X08U,0X08U,0X09U,0X02U,0X04U,0X08U,0X10U,0X00U,0X00U,0X00U,0X00U,0X00U,0X03U,0X02U,0X02U,
+0X22U,0X42U,0X42U,0X42U,0X3aU,0X06U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X20U,0X00U,0X00U,
+};
 //硬件版本：
 const unsigned char gImage_Dyy_words_2X6_Y46[]={/*Byte Size154*/
 76U,16U,
@@ -4190,7 +4226,6 @@ uint8_t nowbanbenhaohoumian = 22;
 const uint16_t  banebenhao1[] = {35,25};
 const uint16_t  banebenhao2[] = {190,180};
 const uint16_t  banebenhao3[] = {105,95};
-extern uint8_t SWtestresult;
 extern uint8_t HWtestresult;
 extern uint8_t PNtestresult;
 extern uint8_t ruanjianbanbenhao[8];
@@ -4227,17 +4262,13 @@ void Display_Version_Info(uint32_t ON_OFF)
             loc_Type_back = loc_Type;
         }
 
-        TFT_LCD_Draw_Bmp(3,   50,   ( uint8_t * )gImage_Dyy_words_1X6_Y16 );      //软件版本号
+        TFT_LCD_Draw_Bmp(3,   50,   ( uint8_t * )gImage_pic_01X0_Y01 );      //软件外部版本号
+        TFT_LCD_Draw_Bmp(3,   75,   ( uint8_t * )gImage_pic_02X0_Y02 );      //软件内部版本号
 
         
         const uint16_t  Currenttest[] = {180,170};
-        if(SWtestresult == 1 && HWtestresult == 1 && PNtestresult == 1)
-        {
-            // General_Number_Disp(ruanjianbanbenhao, 105, 25); 
-            // General_Number_Disp(yingjianbanbenhao, 105, 50);   
-            // General_Number_Disp(lingjianhao, 15, 100);  
-        }
-        TFT_LCD_Draw_Bmp(3,   75,   ( uint8_t * )gImage_Dyy_words_2X6_Y46 );      //硬件版本号
+
+        TFT_LCD_Draw_Bmp(3,   100,   ( uint8_t * )gImage_Dyy_words_2X6_Y46 );      //硬件版本号
         TFT_LCD_Draw_Bmp(3,   25,   ( uint8_t * )gImage_JCT_01X0_Y0 );      //检测台版本号
         TFT_LCD_Draw_Bmp(3,   120,   ( uint8_t * )gImage_Dyy_words_3X6_Y75 );      //写入UID
         TFT_LCD_Draw_Bmp(3,   225,   ( uint8_t * )gImage_JCT_08X0_Y0 );      //读取UID
@@ -4264,7 +4295,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 [10] = {2,0,2,5,97,0,5,2,8,0xff};
+        uint8_t mbuff [10] = {2,0,2,5,97,0,7,1,5,0xff};
         General_Number_Disp(mbuff, 115, 25);  //检测台版本号
         General_Number_Disp(UIDNumber, 85, 120); //固定UID数字
         General_Number_Disp(UIDNumber2, 70, 146); //可调UID数字

YueJin_test_bench/source/Appliciation/Key_user.c

@@ -3,7 +3,6 @@
 #include "Display_Info.h"
 #include "Check_Ctrl.h"
 #include "CAN_APP.h"
-extern uint8_t resetflag;
 void Key_Operation_SW5(Key_Event_en_t enKeyEvent)
 {
     if ( enKeyEvent == KEY_EVENT_SHORT_PRESS )
@@ -105,12 +104,13 @@ void Key_Operation_SW7(Key_Event_en_t enKeyEvent)
     {
     }
 }
-void Key_Operation_SW8(Key_Event_en_t enKeyEvent)
+void Key_Operation_SW3(Key_Event_en_t enKeyEvent)
 {
     if ( enKeyEvent == KEY_EVENT_SHORT_PRESS )
     {
-        
-        
+        begin714 = 0;
+        UIDresult = 0;
+        writebeing = 1;
     }
     else if ( enKeyEvent == KEY_EVENT_LONG_PRESS )
     {
@@ -152,17 +152,7 @@ void Key_Operation_SW1(Key_Event_en_t enKeyEvent)
     if ( enKeyEvent == KEY_EVENT_SHORT_PRESS )
     {
         writeflag = 1;
-        zhenduanstep = 11;
-        UIDStep = 0;
         writebeing = 1;
-        // if(UIDNumber2[change] < 9)
-        // {
-        //     UIDNumber2[change]++;
-        // }
-        // else
-        // {
-        //     UIDNumber2[change] = 0;
-        // }
         Display_TFT_Clear_UID2();
     }
     else if (( enKeyEvent == KEY_EVENT_LONG_PRESS ) && (MENU_CHECK_STEP == 10))
@@ -212,12 +202,12 @@ Key_Real_Status_en_t Key_Real_sw7(void)
     }
     return enKeyRealStatus;
 }
-Key_Real_Status_en_t Key_Real_sw8(void)
+Key_Real_Status_en_t Key_Real_sw3(void)
 {
 
     Key_Real_Status_en_t enKeyRealStatus = KEY_LINE_LOOSEN;
 
-    if ( SW8 == 0U )
+    if ( SW3 == 0U )
     {
         enKeyRealStatus = KEY_LINE_PRESS;
     }
@@ -251,7 +241,7 @@ const Key_Attribute_st_t stKeyAttribute [ KEY_NUM_MAX ] = {
     {KEY_TYPE_LINE, Key_Real_sw5, Key_Operation_SW5},    //SW5
     {KEY_TYPE_LINE, Key_Real_sw4, Key_Operation_SW4},    //SW4
     {KEY_TYPE_LINE, Key_Real_sw7, Key_Operation_SW7},
-    {KEY_TYPE_LINE, Key_Real_sw8, Key_Operation_SW8},
+    {KEY_TYPE_LINE, Key_Real_sw3, Key_Operation_SW3},
     {KEY_TYPE_LINE, Key_Real_sw2, Key_Operation_SW2},      //SW2-
     {KEY_TYPE_LINE, Key_Real_sw1, Key_Operation_SW1},    //SW1+
 

YueJin_test_bench/source/Appliciation/Task.c

@@ -33,6 +33,18 @@ void Sys_Run_Mode_Pseudo_Real_Time_Tasks(void)
     TFT_LCD_Display_Update_Service( );
     Get_PN_msg();
     // Get_UID_msg();
+    if(SWINtestresult == 1)
+    {
+        Get_SWIN_msg();
+    }
+    if(SWtestresult == 1)
+    {
+        Get_SW_msg();
+    }
+    if(HWtestresult == 1)
+    {
+        Get_HW_msg();
+    }
 }
 /*============================================================================*/
 
@@ -59,12 +71,8 @@ void Sys_Run_Mode_5ms_Tasks_Group(void)
 ------------------------------------------------------------------------------*/
 uint32_t fakedelay = 0;
 uint32_t send0x714time = 0;
-uint8_t cycleflag = 0;
-uint8_t getmsgfinish = 0;
-extern uint8_t SWtestresult;
 extern uint8_t HWtestresult;
 extern uint8_t PNtestresult;
-extern uint8_t resetflag;
 extern uint8_t fuelreset1;
 extern uint8_t fuelreset2;
 extern uint8_t fuelreset3;
@@ -109,10 +117,8 @@ void Sys_Run_Mode_10ms_Tasks_Group(void)
     else
     {
         change_UDS_DID();
-        // cycleflag = 1;
     }
-    if(resetflag == 0)
-    {
+
     if(MENU_CHECK_STEP == 0)
     {
         if(send0x714time < 4)
@@ -127,7 +133,6 @@ void Sys_Run_Mode_10ms_Tasks_Group(void)
                 send0x714time = 0;
             }
         }
-            
     }
     else
     {
@@ -135,27 +140,11 @@ void Sys_Run_Mode_10ms_Tasks_Group(void)
     }
 
     can_submit();
-    }
 
     if(writeflag == 1)
     {
         UIDWrite();
     }
-    // if(getmsgfinish == 0)
-    // {
-    //     if(cycleflag == 0)
-    //     {
-
-
-    //     }
-    //     else
-    //     {
-
-    //         send_0x714_fuc();
-            
-    //         // cycleflag = 0;
-    //     }
-    // }