✨ feat:添加基础功能

YueJin_test_bench/source/Appliciation/Check_Ctrl.c

@@ -681,16 +681,9 @@ void Function_Check_Ctrl(uint32_t cmd)
                 /*正控*/
                 if(POWER_CTRL_KL15==1)
                 {
-                LINE_OUT_POS_02 = 1;        //远光
-                // if(LIN_Flag.LIN_RIGHT_Flag==0)
-                // {
-                     LINE_FUEL_RES04222 = 1;//右转
-                     Gen_TimeDelay (200 *1000,50U);
-                     LINE_FUEL_RES04222=0;
-                    //  LIN_Flag.LIN_RIGHT_Flag++;
-                // }
-                 LINE_FUEL_RES04111 = 0;//左转
-               
+                LINE_OUT_POS_02 = 0;        //远光
+                LINE_FUEL_RES04111 = 0;        //左转
+                LINE_FUEL_RES04222 = 0;        //右转
                 LINE_OUT_POS_11 = 0;        //防盗
                 LINE_OUT_POS_12 = 0;        //机油压力
                 /*燃油5200,93,55,10*/
@@ -725,20 +718,18 @@ void Function_Check_Ctrl(uint32_t cmd)
                 /*正控*/
                 if(POWER_CTRL_KL15==1)
                 {
-                LINE_RESET=1;
-                LINE_OUT_POS_02 = 0;        //远光
-
-                // if(LIN_Flag.LIN_LEFT_Flag==0)
+                LINE_OUT_POS_02 = 1;        //远光
+                // if(LIN_Flag.LIN_RIGHT_Flag==0)
                 // {
-                     LINE_FUEL_RES04111 = 1;
-                     Gen_TimeDelay ( 200 *1000,50U);
-                     LINE_FUEL_RES04111=0;
-                    //  LIN_Flag.LIN_LEFT_Flag++;
+                     LINE_FUEL_RES04222 = 1;//右转
+                     Gen_TimeDelay (200 *1000,50U);
+                     LINE_FUEL_RES04222=0;
+                    //  LIN_Flag.LIN_RIGHT_Flag++;
                 // }
+                 LINE_FUEL_RES04111 = 0;//左转
                
-                LINE_FUEL_RES04222 = 0;//右转
-                LINE_OUT_POS_11 = 1;        //防盗
-                LINE_OUT_POS_12 = 1;        //机油压力
+                LINE_OUT_POS_11 = 0;        //防盗
+                LINE_OUT_POS_12 = 0;        //机油压力
                 /*燃油*/
           FUEL_RES_1 = 0;//2格
                 FUEL_RES_2 = 1;
@@ -746,7 +737,7 @@ void Function_Check_Ctrl(uint32_t cmd)
                 FUEL_RES_4 = 0;
                   //温度
                 FUEL_T_1=0;
-                FUEL_T_2=0;
+                FUEL_T_2=1;
                 FUEL_T_3=0;
                 FUEL_T_4=0;
             }
@@ -769,16 +760,20 @@ void Function_Check_Ctrl(uint32_t cmd)
                 /*正控*/
                 if(POWER_CTRL_KL15==1)
                 {
+                LINE_RESET=1;
                 LINE_OUT_POS_02 = 0;        //远光
-                LINE_FUEL_RES04111 = 0;//左转
+
+                // if(LIN_Flag.LIN_LEFT_Flag==0)
+                // {
+                     LINE_FUEL_RES04111 = 1;
+                     Gen_TimeDelay ( 200 *1000,50U);
+                     LINE_FUEL_RES04111=0;
+                    //  LIN_Flag.LIN_LEFT_Flag++;
+                // }
+               
                 LINE_FUEL_RES04222 = 0;//右转
-                LINE_OUT_POS_11 = 0;        //防盗
+                LINE_OUT_POS_11 = 1;        //防盗
                 LINE_OUT_POS_12 = 1;        //机油压力
-                // if(LIN_Flag.LIN_LEFT_Flag==1 || LIN_Flag.LIN_RIGHT_Flag==1)
-                // {
-                LINE_RESET=1;       //复位
-                Gen_TimeDelay ( 100 *1000,50U);
-                LINE_RESET=0;
             //    flagtime ++;
             //     }
             //     if(flagtime==3)
@@ -868,7 +863,7 @@ void Function_Check_Ctrl(uint32_t cmd)
                 FUEL_RES_4 = 1;
                   //温度
                 FUEL_T_1=0;
-                FUEL_T_2=1;
+                FUEL_T_2=0;
                 FUEL_T_3=0;
                 FUEL_T_4=0;
          

YueJin_test_bench/source/Appliciation/Task.c

@@ -135,7 +135,7 @@ void Sys_Run_Mode_10ms_Tasks_Group(void)
     {
             if((writeflag == 1) && (POWER_CTRL_KL15==1))
     {
-        UIDWrite();
+        // UIDWrite();
     }
     }
 
@@ -157,7 +157,7 @@ void Sys_Run_Mode_10ms_Tasks_Group(void)
 
 
 
-Meter_field_display(MENU_CHECK_STEP);
+// Meter_field_display(MENU_CHECK_STEP);
     //刷数字、刷英文拼写。
     //GUI_General_Digit_Display(123456789, Num_09, 10, 0, BackLightDigitNum09PosX, 79);
     //GUI_General_Digit_Display(123456789, Num_10_03, 10, 0, BackLightDigitNum09PosX, 79+24*1);
@@ -420,7 +420,7 @@ if(LINE_RESET == 1)
         POWER_CTRL_KL30   = 1u;  //B+
         POWER_CTRL_KL15   = 0u;  //KL15
         LINE_OUT_key  = 1;
-        if(delay==11)
+        if(delay==61)
         {
         POWER_CTRL_KL30   = 1u;  //B+
         POWER_CTRL_KL15   = 1u;  //KL15
@@ -519,7 +519,22 @@ if(LINE_RESET == 1)
         igonoff=7;
         }
     }
-     else  if((MENU_CHECK_STEP==9) &&(igonoff ==7))
+    else  if((MENU_CHECK_STEP==8) &&(igonoff ==7))
+    {
+         delay++;
+        // POWER_CTRL_KL30   = 0u;  //B+
+        POWER_CTRL_KL15   = 0u;  //KL15
+              LINE_OUT_cartoon=0;
+        if(delay==11)
+        {
+        // POWER_CTRL_KL30   = 1u;  //B+
+        POWER_CTRL_KL15   = 1u;  //KL15
+        LINE_OUT_cartoon=1;
+        delay=0;
+        igonoff=8;
+        }
+    }
+     else  if((MENU_CHECK_STEP==9) &&(igonoff ==8))
     {
        delay++;
         POWER_CTRL_KL30   = 0u;  //B+

YueJin_test_bench/source/Driver/CAN/RSCAN.c

@@ -846,22 +846,10 @@ void RSCAN0_CH4_Receive(CAN_Frame_st_t *pstCANFrame)
         {
             ruanjianinsidebanbenhao[3] = u8getSWmsg1[1];
             ruanjianinsidebanbenhao[4] = u8getSWmsg1[2];
-            ruanjianinsidebanbenhao[5] = u8getSWmsg1[3];
-            ruanjianinsidebanbenhao[6] = u8getSWmsg1[4];
-            ruanjianinsidebanbenhao[7] = u8getSWmsg1[5];
-            ruanjianinsidebanbenhao[8] = u8getSWmsg1[6];
-            ruanjianinsidebanbenhao[9] = u8getSWmsg1[7];
-            SWFlag=2;
-            zhenduanstep=2;
-        }
-        else if((u8getSWmsg1[0] == 0x22) && (SWFlag==2))
-        {
-            ruanjianinsidebanbenhao[10] = u8getSWmsg1[1];
-            ruanjianinsidebanbenhao[11] = u8getSWmsg1[2];
-            ruanjianinsidebanbenhao[12] = 0xFF;
-            General_Number_Disp(ruanjianinsidebanbenhao, 03, 50);
+            ruanjianinsidebanbenhao[5] = 0xFF;
+            General_Number_Disp(ruanjianinsidebanbenhao, 125, 25);
             SWFlag=0;
-
+            zhenduanstep=2;
         }
          else if((u8getSWmsg1[0] == 0x10) && (u8getSWmsg1[4] == 0x81) && (SWoutflag==0))
         {
@@ -881,7 +869,7 @@ void RSCAN0_CH4_Receive(CAN_Frame_st_t *pstCANFrame)
             ruanjianoutsidebanbenhao[7] = u8getSWmsg1[5];
             ruanjianoutsidebanbenhao[8] = 0xFF;
      
-            General_Number_Disp(ruanjianoutsidebanbenhao, 03, 100);
+            General_Number_Disp(ruanjianoutsidebanbenhao, 125, 50);
             // UDSStep = 2;
             SWoutflag=2;
         }
@@ -902,7 +890,7 @@ void RSCAN0_CH4_Receive(CAN_Frame_st_t *pstCANFrame)
             H630BUFFER[7] = u8getSWmsg1[5];
             H630BUFFER[8]=0xFF;
      
-            General_Number_Disp(H630BUFFER, 110, 250);
+            General_Number_Disp(H630BUFFER, 125, 150);
             // UDSStep = 2;
             SWoutflag=4;
         }
@@ -923,7 +911,7 @@ void RSCAN0_CH4_Receive(CAN_Frame_st_t *pstCANFrame)
             BOOT2[7] = u8getSWmsg1[5];
             BOOT2[8]=0xFF;
      
-            General_Number_Disp(BOOT2, 110, 225);
+            General_Number_Disp(BOOT2, 125, 125);
             // UDSStep = 2;
             SWoutflag=6;
         }
@@ -949,7 +937,7 @@ void RSCAN0_CH4_Receive(CAN_Frame_st_t *pstCANFrame)
             HWin[8] = 0xFF;
             SWoutflag=8;
             
-             General_Number_Disp(HWin, 03, 150);
+             General_Number_Disp(HWin, 125, 75);
         }
         else if((u8getSWmsg1[0] == 0x10) && (u8getSWmsg1[4] == 0x29) && (SWoutflag==8))
         {
@@ -969,7 +957,7 @@ void RSCAN0_CH4_Receive(CAN_Frame_st_t *pstCANFrame)
             HWout[8]=u8getSWmsg1[6];
             HWout[9]=0xFF;
            
-            General_Number_Disp(HWout, 03, 200);
+            General_Number_Disp(HWout, 125, 100);
             // UDSStep = 2;
             SWoutflag=0;
         }