调整bUG

source/Application/APP/SEG_LCD/SEG_DISPLAY.c

@@ -1123,28 +1123,10 @@ void Seg_Display_Service(void)
 
                 wbyTestNum = Common_Get_Disp_V_Speed();
                 SEG_VehicleSpeed_Num(wbyTestNum, GUI_DISP_MODE_NORMAL); //车速值
-
-                // SEG_PRI_Display(wbyTestSeg,GUI_DISP_MODE_NORMAL,7u) ;//PRI气压格
-                // SEG_SEC_Display(wbyTestSeg,GUI_DISP_MODE_NORMAL,7u) ;//SEC气压格
-                // SEG_Coolant_Display(wbyTestSeg,GUI_DISP_MODE_NORMAL,7u) ;//水温格
-                // SEG_Fuel_Display(wbyTestSeg, GUI_DISP_MODE_NORMAL,7u);//燃油格
-                // SEG_Tacho_Display(wbyTestSeg,GUI_DISP_MODE_NORMAL,7u);//转速格
-                // SEG_VehicleSpeed_Display(wbyTestSeg,GUI_DISP_MODE_NORMAL,7u);//车速格
-                // SEG_VehicleSpeed_Num(wbyTestNum,GUI_DISP_MODE_NORMAL);//车速值
             }
             else
             {
                 GaugesTimer--;
-
-                /*此处为测试水温走格速度用*/
-                //if (Coolant_Get_Valid())
-                //{
-                //    SEG_Coolant_Display(Coolant_Get_CurSeg(), GUI_DISP_MODE_NORMAL, 7u); //水温格
-                //}
-                //else
-                //{
-                //    SEG_Coolant_Display(Coolant_Get_CurSeg(), GUI_DISP_MODE_INVALID, 7u); //水温格
-                //}
             }
         }
     }

source/Application/Alarm/Popups.c

@@ -744,21 +744,21 @@ void Popups_Polling(void)
                 }
 
                 /*49.--3--AMT磨耗-离合器磨损 ID：18FF8503　Bite：2 Bit：2,1  001(B)  LID $41 : 0x13*/
-                variable_1 = Get_ID_18FF8503_Sig_Manouvering_mode();
+                variable_1 = Get_ID_18FF8503_Sig_Clutch_Wear_warning();
 
                 if (variable_1 == 0x01u)
                 {
-                    Popup_Request(POPUP1_BRAKE_BRAKE);
+                    Popup_Request(POPUP8_ATM_WORN_OUT);
                 }
                 else
                 {
-                    Popup_Delete(POPUP1_BRAKE_BRAKE);
+                    Popup_Delete(POPUP8_ATM_WORN_OUT);
                 }
             }
             else
             {
                 Popup_Clear(POPUP8_ATM_CLUCH_OVERHEATING);
-                Popup_Clear(POPUP1_BRAKE_BRAKE);
+                Popup_Clear(POPUP8_ATM_WORN_OUT);
             }
 
             /*50.--4--低电压报警 显示条件：发动机启动(350r/min)后，7秒检测到23.5V时 显示消失条件：10秒检测到25V以上时*/

source/Application/CAN_APP_NM/CAN_App/CAN_FUNC.c

@@ -22,6 +22,7 @@
 #include "DisplaySch_user.h"
 #include "DispSch.h"
 #include "FuelConfig.h"
+#include "CD4051.h"
 
 uint8_t TpmsMsg18033317SendFlag = 0;
 
@@ -453,9 +454,76 @@ void Can_Set_Buff_18FF2A17(uint8_t CopyData[])
 
     /*剩余燃料报警*/
     Remining_Fuel_Warning = Fuel_Get_Popup_Sta();
+
+    Battery_Maintenance_Warning = 0u;
+    Meter_Malfunction = 0u;
+    SRS_Input = 0u;
+    SW_Rear_Body_Warning = 0u;
+    SW_Sheetbelt = 0u;
+    SW_Oil_Pressure = 0u;
+    SW_Coolant_Level = 0u;
+    SW_Water_Separator = 0u;
+    SW_Clutch = 0u;
+    SW_Air_Low_Pressure = 0u;
+    SW_MT_Range = 0u;
+    SW_MT_Spriter = 0u;
+    SW_KickDrive = 0u;
+    SW_DefLock = 0u;
+    ACG_L_Terminal = 0u;
+    Reserve = 0u;
+    SW_Dr_Door = 0u;
+    EDS_Smoother_WL_Status = 0u;
+    EBS_Warning_Red = 0u;
+    EBS_Warning_Yellow = 0u;
+    ESC_Operating = 0u;
+    Air_Sus_Warning = 0u;
+    Roll_Warning = 0u;
+    ROWS_Warning = 0u;
+    Mult_Indication = 0u;
+
+    /*钥匙状态*/
+    /*A3-28 A20-GND B39-OPEN  A2-OPEN*/
+    if (
+        (CD4051_COM3_X7_IN == 1u) &&
+        (CD4051_COM3_X5_IN == 0u) &&
+        (Line_In_Get_Status(LINE_IN_ACC) == 0u) &&
+        (Common_Get_IG_Sts() != COMMON_POWER_ON)
+    )
+    {
+        SW_KeyRemind = 0u;
+    }
+    else
+    {
+        SW_KeyRemind = 1u;
+    }
+
+    /*远光灯状态*/
+    if (Line_In_Get_Status(LINE_IN_HI_BEAM) == 1)
+    {
+        SW_Hi_Beam = 1u;
+    }
+    else
+    {
+        SW_Hi_Beam = 0u;
+    }
+
+    TURN_R_Lamp_Status = 0u;
+    SW_Illmi = 0u;
+    SW_SpotLamp = 0u;
+    SW_Accessory_Air = 0u;
+    SW_Trailer_Brake = 0u;
+    Input_Trailer_Info = 0u;
+    Input_Trailer_ABS = 0u;
+    SW_Coupler_Lock = 0u;
+
     /*电源电压*/
     IGN_Voltage  = (9 + Gui_Get_Voltmeter_DisplayMode()) * 10 ;
 
+    MJX_MEB9_Manual_TM_Range_Low = 0u;
+    Range_Air_Cut_Warning = 0u;
+    IRIS_Warning_Lamp_Status = 0u;
+    Temperature = 0u;
+
     CopyData[0] = (uint8_t)(((Water_Temp_Level << 6u) & 0xC0u) |
                             ((Remining_Fuel_Warning << 5u) & 0x20u) |
                             ((Battery_Maintenance_Warning << 3u) & 0x18u) |

source/Application/RTE/RTE_PWM_OUT.c

@@ -75,14 +75,14 @@ void RTE_PWM_Set_Speed_Out(uint16_t m_Cycle, uint16_t m_Duty)
     Fre_8_pulse /= 8 ;
 
     /*A16-25  A17-8 A18-8*/
-    /*车速1  8脉冲*/
-    ActSetFreq = TimerB_PWM_Channel_Fre_Set(TIMERB_2_CH10 , Fre_8_pulse , m_Duty);
+    /*车速1  25脉冲*/
+    //ActSetFreq = TimerB_PWM_Channel_Fre_Set(TIMERB_2_CH10 , m_Cycle , m_Duty);
 
-    /*车速2  25脉冲*/
-    ActSetFreq = TimerB_PWM_Channel_Fre_Set(TIMERB_2_CH13 , m_Cycle , m_Duty);
+    /*车速2  8脉冲*/
+    //ActSetFreq = TimerB_PWM_Channel_Fre_Set(TIMERB_2_CH13 , Fre_8_pulse , m_Duty);
 
-    /*车速3  25脉冲*/
-    ActSetFreq = TimerB_PWM_Channel_Fre_Set(TIMERB_2_CH15 , m_Cycle , m_Duty);
+    /*车速3  8脉冲*/
+    //ActSetFreq = TimerB_PWM_Channel_Fre_Set(TIMERB_2_CH15 , Fre_8_pulse , m_Duty);
 }
 
 /*转速频率输出*/
@@ -91,5 +91,4 @@ void RTE_PWM_Set_Tacho_Out(uint16_t m_Cycle, uint16_t m_Duty)
     uint32_t ActSetFreq;
     /*342  10.2  以4脉冲/发动机1转向A39端子输出 */
     ActSetFreq = TimerB_PWM_Channel_Fre_Set(TIMERB_0_CH7 , m_Cycle , m_Duty);
-
 }

source/System/sys_scheduler.c

@@ -30,6 +30,7 @@ void Sys_Init(void)
     SysScheduling.msRocBak            =  0U;
 
     SysScheduling.TaskGroup.ID2ms     =  0U;
+    SysScheduling.TaskGroup.ID5ms     =  0U;
     SysScheduling.TaskGroup.ID10ms    =  0U;
     SysScheduling.TaskGroup.ID20ms    =  0U;
     SysScheduling.TaskGroup.ID50ms    =  0U;

source/System/tasks.c

@@ -255,6 +255,7 @@ void Sys_Run_Mode_100ms_Tasks(void)
     Common_Set_K_Line_Value();
     Common_DTC_Server();
 
+    /*车速频率外发*/
     Drive_Info_Speed1_Plus_Conversion();
 
     //YZHD_Count++;