✨ feat:随时扫码写入校验版本

YueJin_test_bench/source/Appliciation/Barcode_Scanner.c

@@ -362,6 +362,7 @@ void datacheck(void)
     }
 }
 uint8_t cmpresult = 3;
+uint8_t copyover;
 void BarCodeDataGet(void)
 {
 
@@ -369,6 +370,7 @@ void BarCodeDataGet(void)
     {
         memcpy(barcode_Msg,&mDataBufPtr1[6],34);
         memcpy(barcode_Msg1,&mDataBufPtr1[6],34);
+        copyover = 1;
     }
     else
     {

YueJin_test_bench/source/Appliciation/Barcode_Scanner.h

@@ -41,4 +41,5 @@ extern uint8_t btmac[6];
 extern uint8_t writeflag;
 extern uint8_t saomafinish;
 extern uint8_t mimaread[35];
+extern uint8_t copyover;
 #endif
\ No newline at end of file

YueJin_test_bench/source/Appliciation/Check_Ctrl.c

@@ -244,6 +244,8 @@ uint8_t yibiaoshuju[34];
     {
         case 0:
             if(saomafinish == 0)
+            {
+                if(copyover)
                 {
                     for(int i = 0;i<34;i++)
                     {
@@ -257,8 +259,8 @@ uint8_t yibiaoshuju[34];
                     memcpy(erweima,barcode_Msg,34);
                     erweima[34] = 0xFF;
 
-                
                     General_Number_Disp(erweima, 3, 60); 
+                }
 
                 if(writeflag == 1 || writeflag == 3)
                 {

YueJin_test_bench/source/Appliciation/Key_user.c

@@ -17,11 +17,6 @@ void Key_Operation_SW5(Key_Event_en_t enKeyEvent)       //下一步
             { 
                 zhenduansendStep = 0;
                 zhenduanflag = 0;
-                MENU_CHECK_STEP = 0;
-                saomafinish = 4;
-            }
-            else if(saomafinish == 4)
-            {
                 MENU_CHECK_STEP_ADD();
             }
         }
@@ -83,14 +78,10 @@ void Key_Operation_SW7(Key_Event_en_t enKeyEvent)
         // upkeyflag = 1;      //按键加
         if(firstpowerflag == 2)
         {
-            // if(zhenduanflag == 1)
-            // {
-            if(saomafinish == 0)
+            if(saomafinish == 1)
             {
                 zhenduansendStep = 5;
-                zhenduanflag = 1;
             }
-            // }
         }
     }
     else if ( enKeyEvent == KEY_EVENT_LONG_PRESS )
@@ -107,7 +98,17 @@ void Key_Operation_SW8(Key_Event_en_t enKeyEvent)
 {
     if ( enKeyEvent == KEY_EVENT_SHORT_PRESS )
     {
-        // zhenduanflag = 1;
+        if(saomafinish == 3)
+        {
+            Display_TFT_Clear();
+            GUI_Display_Version_Code_Service(25, 20, "Please   Scan   The   Code ", Letter_Num_11, PCodeText_Space_size);
+            firstpowerflag = 0;
+            saomafinish = 0;
+        }
+        else if(saomafinish == 0)
+        {
+            zhenduanflag = 1;
+        }
     }
     else if ( enKeyEvent == KEY_EVENT_LONG_PRESS )
     {

YueJin_test_bench/source/System/init.c

@@ -118,11 +118,12 @@ void Sys_Startup_Init(void)
     LINE_OUT_NEG_03 = 1;
     LINE_OUT_NEG_04 = 1; 
 
-    Display_TFT_Clear();
-    GUI_Display_Version_Code_Service(25, 20, "Please   Scan   The   Code ", Letter_Num_11, PCodeText_Space_size);
+    // Display_TFT_Clear();
+    // GUI_Display_Version_Code_Service(25, 20, "Please   Scan   The   Code ", Letter_Num_11, PCodeText_Space_size);
 
     /*上电扫码校验功能如果需要扫码校验注释掉firstpowerflag = 2，打开上面两行的注释即可*/
-    // firstpowerflag = 2;
+    firstpowerflag = 2;
+    saomafinish = 3;
 }
 
 /***********************************************************************