✨ feat:增加纯色自扫

YueJin_test_bench/source/Appliciation/CAN_APP.c

@@ -12,6 +12,7 @@
 #define CAN_ID_1 0x781 //诊断ID
 #define CAN_ID_2 0x521
 #define CAN_ID_3 0x522
+#define CAN_ID_4 0x0A01F0AC
 
 //外部软件诊断步骤
 #define SW_OUT_READ_ORDER1 0xF1
@@ -99,84 +100,118 @@ CAN_Register_Result_e checkIfRegistered(void)
 
 void CAN_Service(void)
 {
-    init_CAN_Frame(&m_msg1, CAN_ID_1, 8, 0, data1);     //诊断
-    init_CAN_Frame(&m_msg2, CAN_ID_2, 8, 0, data2);
-    init_CAN_Frame(&m_msg3, CAN_ID_3, 8, 0, data3);
-    // init_CAN_Frame(&m_msg4, CAN_ID_4, 8, 0, data4);
-    // init_CAN_Frame(&m_msg5, CAN_ID_5, 8, 0, data5);
-    // init_CAN_Frame(&m_msg6, CAN_ID_6, 8, 0, data6);
-
-    can_mid(m_msg1);
-    can_mid(m_msg2);
-    can_mid(m_msg3);
-    // can_mid(m_msg4);
-    // can_mid(m_msg5);
-    // can_mid(m_msg6);
+    if(UDS_DisableFlag == 0)
+    {
+        init_CAN_Frame(&m_msg1, CAN_ID_1, 8, 0, data1);     //诊断
+        can_mid(m_msg1);
+    }
+    else
+    {
+        init_CAN_Frame(&m_msg2, CAN_ID_2, 8, 0, data2);
+        init_CAN_Frame(&m_msg3, CAN_ID_3, 8, 0, data3);
+        init_CAN_Frame(&m_msg4, CAN_ID_4, 8, 1, data4);
+        // init_CAN_Frame(&m_msg5, CAN_ID_5, 8, 0, data5);
+        // init_CAN_Frame(&m_msg6, CAN_ID_6, 8, 0, data6);
+
+        can_mid(m_msg2);
+        can_mid(m_msg3);
+        can_mid(m_msg4);
+        // can_mid(m_msg5);
+        // can_mid(m_msg6);
+    }
 }
 
 void can_submit(void)
 {
     switch (MENU_CHECK_STEP)
     {
+        case  0:
+            data2[1] = 0x00;        //水温
+
+            data3[4] = 0x00;
+            data3[5] = 0x00;
+
+            data4[0] = 0x00;
+            break;
         case  1:
             data2[1] = 0x00;        //水温
 
             data3[4] = 0x00;
             data3[5] = 0x00;
+
+            data4[0] = 0x00;
             break;
         case  2:
             data2[1] = 0x5A;
 
             data3[4] = 0xE8;
             data3[5] = 0x03;
+
+            data4[0] = 0x00;
             break;
         case  3:
             data2[1] = 0xAA;
 
             data3[4] = 0xE8;
             data3[5] = 0x03;
+
+            data4[0] = 0x00;
             break;
         case 4:
             data2[1] = 0xAA;
 
             data3[4] = 0xE8;
             data3[5] = 0x03;
+
+            data4[0] = 0x00;
             break;
         case 5:
             data2[1] = 0x00;
 
             data3[4] = 0x00;
             data3[5] = 0x00;
+
+            data4[0] = 0x01;        //白
             break;
         case 6:
             data2[1] = 0x00;
 
             data3[4] = 0x00;
             data3[5] = 0x00;
+
+            data4[0] = 0x02;        //红
             break;
         case 7:
             data2[1] = 0x00;
 
             data3[4] = 0x00;
             data3[5] = 0x00;
+
+            data4[0] = 0x03;        //绿
             break;
         case 8:
             data2[1] = 0x00;
 
             data3[4] = 0x00;
             data3[5] = 0x00;
+
+            data4[0] = 0x04;        //蓝
             break;
         case 9:
             data2[1] = 0x00;
 
             data3[4] = 0x00;
             data3[5] = 0x00;
+
+            data4[0] = 0x05;        //黑白格
             break;
         case 10:
             data2[1] = 0x00;
 
             data3[4] = 0x00;
             data3[5] = 0x00;
+
+            data4[0] = 0x06;        //黑
             break;
         default:
             break;

YueJin_test_bench/source/Appliciation/Display_Info.c

@@ -4282,7 +4282,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,1,0,2,3,0xff};
+        uint8_t mbuff [10] = {2,0,2,5,97,1,2,0,1,0xff};
         General_Number_Disp(mbuff, 115, 200);  //检测台版本号
         // General_Number_Disp(UIDNumber, 85, 120); //固定UID数字
         // General_Number_Disp(UIDNumber2, 70, 146); //可调UID数字

YueJin_test_bench/source/Appliciation/Task.c

@@ -140,16 +140,13 @@ void Sys_Run_Mode_10ms_Tasks_Group(void)
     }
     else
     {
-        // if(UDS_DisableFlag == 0)
-        // {
-            UDS_DisableFlagnumber++;
-            if(UDS_DisableFlagnumber >= CAN_SEND_TIME)
-            {
-                UDS_DisableFlagnumber = 0;
-                UDS_Process_Service();
-                CAN_Service();
-            }
-        // }
+        UDS_DisableFlagnumber++;
+        if(UDS_DisableFlagnumber >= CAN_SEND_TIME)
+        {
+            UDS_DisableFlagnumber = 0;
+            UDS_Process_Service();
+            CAN_Service();
+        }
     }
 
 
@@ -172,7 +169,6 @@ void Sys_Run_Mode_10ms_Tasks_Group(void)
 void Sys_Run_Mode_20ms_Tasks_Group0(void)
 {
     //Total_Check( );
-    CAN_Service();
 }
 
 /*==============================================================================