Merge branch 'shihao' into 'develop'

修改DTC阻值

See merge request !35

source/Appliciation/FuelConfig.c

@@ -173,14 +173,6 @@ void ExecFuel(void)
             MinFuelData.Step_Get_Valid = 1;  
             MinFuelData.Step_Get_Value = GetFuelStep();
             MinFuelData.Res_Pre_Get = GetFuelResistance(); //  zu zhi
-            if(GetFuelResistance() > 2650)
-            {
-                MinFuelData.Fuel_Sensor_Resistance_Low = 1;
-            }
-            else
-            {
-                MinFuelData.Fuel_Sensor_Resistance_Low = 0;
-            }
             //if (Line_In_Get_Status(LINE_IN_Block_Diesel_Filter) == 1u)
             //{
             //    MinFuelData.Fuel_Sensor_Resistance_High = 1;
@@ -355,7 +347,7 @@ void AvgFuel_ConsOf100msUL_Set(uint16_t FuelCons)
 
 uint8_t GET_Fuel_Sensor_Resistance_High(void)
 {
-   if (GetFuelResistance() <= 30)
+   if (GetFuelResistance() > 5150)
    {
         MinFuelData.Fuel_Sensor_Resistance_High = 1;
    }
@@ -363,11 +355,21 @@ uint8_t GET_Fuel_Sensor_Resistance_High(void)
    {
        MinFuelData.Fuel_Sensor_Resistance_High = 0;
    }
+
+
    return MinFuelData.Fuel_Sensor_Resistance_High;
 }
 
 uint8_t GET_Fuel_Sensor_Resistance_Low(void)
 {
+    if(GetFuelResistance() <= 30)
+    {
+        MinFuelData.Fuel_Sensor_Resistance_Low = 1;
+    }
+    else
+    {
+        MinFuelData.Fuel_Sensor_Resistance_Low = 0;
+    }
    return MinFuelData.Fuel_Sensor_Resistance_Low;
 }
 

source/Appliciation/Sound_Alarm_handle.c

@@ -40,32 +40,32 @@ void Sound_Alarm_Trigger_GEAR_P(void)
     {
 
         //{
-        if ( (Get_CAN_CH0_ID_10FF7521_Sig_PsngrDoorSts( ) == 1) || (Get_CAN_CH0_ID_10FF7521_Sig_DriverDoorSts( ) == 1) || (Get_CAN_CH0_ID_10FF7521_Sig_RHRDoorSts( ) == 1) )
-        {
-            uint16_t u16SndGear = Get_CAN_CH0_ID_18F00503_Sig_TransCurrentGear( );
-            if ( (Get_EngSpeed_Start_Flag( ) == 1U) )
-            {
-                if ( u16SndGear == 0X7D )    // N
-                {
-                    if ( Line_In_Get_Status(LINE_IN_Handbrake) == 1U )
-                    {
-
-                        u16SndTig = 1;
-                    }
-                }
-                else
-                {
-                    u16SndTig = 1;
-                }
-            }
-            if ( u16SndGear == 0x7C )    // R
-            {
-                if ( Get_DispVechileSpeed( ) >= 10 )
-                {
-                    u16SndTig = 1;
-                }
-            }
-        }
+        // if ( (Get_CAN_CH0_ID_10FF7521_Sig_PsngrDoorSts( ) == 1) || (Get_CAN_CH0_ID_10FF7521_Sig_DriverDoorSts( ) == 1) || (Get_CAN_CH0_ID_10FF7521_Sig_RHRDoorSts( ) == 1) )
+        // {
+        //     uint16_t u16SndGear = Get_CAN_CH0_ID_18F00503_Sig_TransCurrentGear( );
+        //     if ( (Get_EngSpeed_Start_Flag( ) == 1U) )
+        //     {
+        //         if ( u16SndGear == 0X7D )    // N
+        //         {
+        //             if ( Line_In_Get_Status(LINE_IN_Handbrake) == 1U )
+        //             {
+
+        //                 u16SndTig = 1;
+        //             }
+        //         }
+        //         else
+        //         {
+        //             u16SndTig = 1;
+        //         }
+        //     }
+        //     if ( u16SndGear == 0x7C )    // R
+        //     {
+        //         if ( Get_DispVechileSpeed( ) >= 10 )
+        //         {
+        //             u16SndTig = 1;
+        //         }
+        //     }
+        // }
         // if ( u16SndTig == 0 )
         // {
         //     u8SoundAlarmGearPOnce = 1;

source/UDS/UDS_22Service_Main.c

@@ -13,7 +13,7 @@ const uint8_t DID_22_F193[8]   = {'V','1','.','0',0x20,0x20,0x20,0x20};
 /*ECUHardwareVersionNumberDataIdentifier（软件号）*/
 const uint8_t DID_22_F194[16]   = {'5','8','0','3','3','1','0','8','1','7',0x20,0x20,0x20,0x20,0x20,0x20};
 /*ECUSoftwareVersionNumberDataIdentifier（软件版本号）*/
-const uint8_t DID_22_F195[8]   = {'V','1','.','3',0x20,0x20,0x20,0x20};
+const uint8_t DID_22_F195[8]   = {'V','1','.','4',0x20,0x20,0x20,0x20};
 /*SystemNameDataIdentifier（ECU名称）*/
 const uint8_t DID_22_F197[10]   = {'I','C','-','N','S','2','0','8','-','2'};
 /*EOLProgrammingDate*/