✨ feat:UUID数字全部可调

YueJin_test_bench/source/Appliciation/CAN_APP.c

@@ -491,7 +491,7 @@ uint8_t UIDStep;
 uint8_t uidWrite;
 uint8_t UIDGetstep = 0;
 uint8_t u8getUIDmsg[8];
-uint8_t UIDNumber[15] = {2,0,0,0,0,0,0,0,0,0,0,1,2,0,0xFF};
+uint8_t UIDNumber[15] = {2,0,0,0,0,0,0,0,0,0,0,0,2,0,0xFF};
 void get_seed_msg(void);
 void UID_ADD(void)
 {
@@ -606,6 +606,9 @@ void  Can_Set_Buff_786(uint8_t CopyData [])
                 // }
                 break;
             case 3:
+                Data_786_8[5] = 0x30 + UIDNumber[0];
+                Data_786_8[6] = 0x30 + UIDNumber[1];
+                Data_786_8[7] = 0x30 + UIDNumber[2];
                 for(uint8_t i = 0;i < 8;i++)
                 {
                     pCANMsg->Msg[i] = Data_786_8[i];
@@ -615,6 +618,13 @@ void  Can_Set_Buff_786(uint8_t CopyData [])
             case 4:
                 if(UIDGetstep == 3)
                 {
+                    Data_786_9[1] = 0x30 + UIDNumber[3];
+                    Data_786_9[2] = 0x30 + UIDNumber[4];
+                    Data_786_9[3] = 0x30 + UIDNumber[5];
+                    Data_786_9[4] = 0x30 + UIDNumber[6];
+                    Data_786_9[5] = 0x30 + UIDNumber[7];
+                    Data_786_9[6] = 0x30 + UIDNumber[8];
+                    Data_786_9[7] = 0x30 + UIDNumber[9];
                    for(uint8_t i = 0;i < 8;i++)
                    {
                        pCANMsg->Msg[i] = Data_786_9[i];
@@ -623,6 +633,11 @@ void  Can_Set_Buff_786(uint8_t CopyData [])
                 }
                 break;
             case 5:
+                Data_786_10[1] = 0x30 + UIDNumber[10];
+                Data_786_10[2] = 0x30 + UIDNumber[11];
+                Data_786_10[3] = 0x30 + UIDNumber[12];
+                Data_786_10[4] = 0x30 + UIDNumber[13];
+
                 Data_786_10[5] = 0x30 + UIDNumber2[0];
                 Data_786_10[6] = 0x30 + UIDNumber2[1];
                 Data_786_10[7] = 0x30 + UIDNumber2[2];

YueJin_test_bench/source/Appliciation/Display_Info.c

@@ -4130,15 +4130,25 @@ void Display_Version_Info(uint32_t ON_OFF)
 
     
 }
+// uint8_t UUIDY = 105;
 uint8_t UUIDX = 170;
 uint8_t UIDNumber2[19] = {2,5,0,6,1,9,0,0,0,0,0,0,0,0,0,0,1,1,0xFF};
 uint8_t UIDNumberread[33];
 void UIDDisplay(void)
 {
+    uint8_t UUIDY;
+    if(CursorPosition == 2)
+    {
+        UUIDY = 105;
+    }
+    else if(CursorPosition == 1)
+    {
+        UUIDY = 65;
+    }
     General_Number_Disp(UIDNumber, 3, 50); //固定UID数字
-    General_Number_Disp(UIDNumber2, 3, 75); //可调UID数字
+    General_Number_Disp(UIDNumber2, 3, 90); //可调UID数字
     uint8_t UUIDS[2] = {45,0xFF};
-    General_Number_Disp(UUIDS, UUIDX, 90); //UID下——
+    General_Number_Disp(UUIDS, UUIDX, UUIDY); //UID下——
     TFT_LCD_Draw_Bmp(3, 25, ( uint8_t * )gImage_Dyy_words_3X6_Y88 );      //UID写入
 }
 

YueJin_test_bench/source/Appliciation/Display_Info.h

@@ -104,6 +104,7 @@ extern const uint8_t *Num_30[];
 extern const uint8_t * Letter_Num_11[];
 
 extern uint32_t loc_Current_0;
+extern uint8_t CursorPosition;
 extern void Get_static_Current(void);
 extern uint32_t Get_Display_Type(void);
 extern void Display_Num(uint16_t StartX, uint16_t StartY,uint16_t m_NUM,uint8_t CbkCycle);

YueJin_test_bench/source/Appliciation/Key_user.c

@@ -136,6 +136,7 @@ void Key_Operation_SW3(Key_Event_en_t enKeyEvent)
 }
 uint8_t change = 17;
 uint8_t writeflag = 0;
+uint8_t CursorPosition = 2;
 void Key_Operation_SW4(Key_Event_en_t enKeyEvent)
 {
     if ( enKeyEvent == KEY_EVENT_SHORT_PRESS )
@@ -144,13 +145,27 @@ void Key_Operation_SW4(Key_Event_en_t enKeyEvent)
         if(UIDMondel)
         {
             Display_TFT_Clear();
-            if(UIDNumber2[change] < 9)
+            if(CursorPosition == 2)
             {
-                UIDNumber2[change]++;
+                if(UIDNumber2[change] < 9)
+                {
+                    UIDNumber2[change]++;
+                }
+                else
+                {
+                    UIDNumber2[change] = 0;
+                }
             }
-            else
+            else if(CursorPosition == 1)
             {
-                UIDNumber2[change] = 0;
+                if(UIDNumber[change] < 9)
+                {
+                    UIDNumber[change]++;
+                }
+                else
+                {
+                    UIDNumber[change] = 0;
+                }
             }
         }
     }
@@ -183,8 +198,18 @@ void Key_Operation_SW5(Key_Event_en_t enKeyEvent)
             }
             else
             {
-                change = 17;
-                UUIDX = 170;
+                if(CursorPosition == 2)
+                {
+                    change = 13;        //第一行最后一位
+                    UUIDX = 130;        //第一行坐标
+                    CursorPosition = 1;         //配置到第一行
+                }
+                else if(CursorPosition == 1)
+                {
+                    change = 17;
+                    UUIDX = 170;        //第一行坐标
+                    CursorPosition = 2;
+                }
             }
             guangganmondel = 0;
         }

YueJin_test_bench/source/Driver/CAN/RSCAN.c

@@ -986,7 +986,7 @@ void RSCAN0_CH4_Receive(CAN_Frame_st_t *pstCANFrame)
                         uidWrite = 0;
                         UIDGetstep = 5;
                         Display_TFT_Clear();
-                        General_Number_Disp(writesuccess, 3, 120); //写入成功
+                        General_Number_Disp(writesuccess, 3, 130); //写入成功
                         UID_ADD();
                     }
                 }