调整燃油相关无用函数

source/Application/APP/Data_Fuel/Data_Fuel_User.c

@@ -4,28 +4,9 @@
 #include "RTE_ADC.h"
 #include "GPIO.h"
 #include "Services_ODO_User.h"
-//-------------------------------------------
-//燃油 数据处理
-//-------------------------------------------
-// 342 - 4.2.燃油表
-//-------------------------------------------
 
-/*----------------------------------------------------------------------------------------------------------------------
-格          0      1       2       3       4       5       6       7       8       9       10      11      12
-
-阻值(Up)   -      144.5   126.5   108.1   90.9    75.7    60.6    47.3    38.2    29.1    21      15.5    9.9
-
-step                13      23      33      43      52      61      68      73      79      83      86      90
-
-阻值(Down)     150    137.3   119.1   100.9   84.8    69.7    54.5    43.6    34.5    25.4    18.8    13.2    -
-
-step        0       17      27      38      47      55      64      70      76      81      84      88
-
-
-
-*-----------------------------------------------------------------------------------------------------------------------*/
-static uint8_t Fuel_CurSeg = 0;
-static uint8_t Fuel_CyrStep = 0u;
+static uint16_t Fuel_CurSeg;
+static uint16_t Fuel_CyrStep;
 
 /*-------------------------------------------------------------------------
  * Function Name  : Fuel_User_KL30_Init
@@ -37,6 +18,9 @@ static uint8_t Fuel_CyrStep = 0u;
  --------------------------------------------------------------------------*/
 void Fuel_User_KL30_Init(void)
 {
+    Fuel_CurSeg = 0u;
+    Fuel_CyrStep = 0u;
+
     FuelStruct FuelInitPara;
     AFC_INIT AFCInit;
     uint32_t ODO_Value = 0u;
@@ -72,7 +56,7 @@ void Fuel_User_KL30_Init(void)
     InitFuelParamter(&FuelInitPara);
     InitAFC(&AFCInit);
 
-    //----hyq--20190603--燃油上涨为下降的0.6
+    /*----燃油上涨为下降的0.6----*/
     SetIgnOffRefuelThreshold(6);
 
     SetPowerDnStep(0);
@@ -116,7 +100,6 @@ void Fuel_User_KL15_ON_Processing_Service(void)
     uint16_t FuelResistanceV = 0u;
     uint32_t ODO_Value = 0u;
 
-    // In ---> Lib
     FuelR_Valid = RTE_Read_FUEL_R_Valid();
     Vspeed_Valid = Common_Get_Act_V_Speed_Valid();
     Espeed_Valid = Common_Get_Act_E_Speed_Valid();
@@ -155,16 +138,16 @@ void Fuel_User_KL15_ON_Processing_Service(void)
 
         ODO_Value = Data_ODO_Read();
 
-        AFCPara.CurODO = ODO_Value * 100; // m
-        AFCPara.FuleConsume = 0;
-        AFCPara.RPM = Espeed;          // 1
-        AFCPara.Speed = (Vspeed / 10u); // 0.1
+        AFCPara.CurODO = ODO_Value * 100u;
+        AFCPara.FuleConsume = 0u;
+        AFCPara.RPM = Espeed;
+        AFCPara.Speed = (Vspeed / 10u);
 
         SetAFCPara((AFC_PARA *)&AFCPara);
         FuelFSM(FuelR); /*新版增加系数*/
 
-        FuelResistanceV = GetFuelResistance(); //燃油电阻获取
-        // Lib ---> Out
+        FuelResistanceV = GetFuelResistance(); /*燃油电阻获取*/
+
         FuelMode = GetFuelSensorState(); /*燃油状态获取*/
 
         if (FuelMode == FuelSensorNormal)
@@ -223,46 +206,12 @@ uint8_t Fuel_Get_CurSeg(void)
     return Fuel_CurSeg;
 }
 
-uint8_t Fuel_Get_CyrStep(void)
-{
-    return Fuel_CyrStep;
-}
-/*-------------------------------------------------------------------------
- * Function Name  : Fuel_Get_Percent
- * Description    : 燃油百分比
- * Input          : None
- * Output         : None
- * Return         : None
- * onther         : 应用于外发报文
- --------------------------------------------------------------------------*/
-uint8_t Fuel_Get_Percent(void)
-{
-    uint16_t Percent = 0;
-    uint8_t Step = 0;
-
-    Step = GetFuelStep();
-    if (Step <= 10)
-    {
-        Percent = 0;
-    }
-    else if (Step >= 90)
-    {
-        Percent = 100;
-    }
-    else
-    {
-        Step -= 10;
-        Percent = Step;
-        Percent *= 100; //放大100倍
-        Percent /= 80;  // 90 - 10
-    }
-    return Percent;
-}
-
+/*返回燃油库电阻值*/
 uint16_t Fuel_Get_Res(void)
 {
     return GetFuelResistance();
 }
+
 uint16_t Fuel_Get_Step(void)
 {
     uint16_t FuelStep = 0u;
@@ -270,47 +219,4 @@ uint16_t Fuel_Get_Step(void)
     FuelStep = GetFuelStep();
 
     return FuelStep;
-}
-
-uint8_t Fuel_Get_LowAlarm(void)
-{
-    uint8_t u8Result = 0;
-    uint8_t FuelMode = 0;
-    uint8_t Step = 0;
-    uint8_t FuelR_Valid = 0;
-    uint16_t FuelR = 0;
-    FuelR_Valid = RTE_Read_FUEL_R_Valid();
-
-    FuelMode = GetFuelSensorState();
-    Step = GetFuelStep();
-
-    if (FuelR_Valid)
-    {
-        FuelR = RTE_Read_FUEL_R();
-    }
-
-    if (FuelMode == FuelSensorNormal)
-    {
-        if (FuelR > 30 && FuelR < 3000)
-        {
-            if (Step < 20)
-            {
-                u8Result = 1;
-            }
-            else
-            {
-                u8Result = 0;
-            }
-        }
-        else
-        {
-            u8Result = 0;
-        }
-    }
-    else
-    {
-        u8Result = 0;
-    }
-
-    return u8Result;
-}
+}
\ No newline at end of file

source/Application/APP/Data_Fuel/Data_Fuel_User.h

 #ifndef DATA_FUEL_USER_H
 #define DATA_FUEL_USER_H
 
-
 #include "TYW_stdint.h"
 
-
-
 extern void Fuel_User_KL30_Init(void);
 extern void Fuel_User_KL15_ON_Init(void);
 extern void Fuel_User_KL15_OFF_Init(void);
@@ -14,13 +11,7 @@ extern void Fuel_User_Sleep_Init(void);
 extern void Fuel_User_KL15_ON_Processing_Service(void);
 extern void Fuel_User_KL15_OFF_Processing_Service(void);
 
-extern uint8_t Fuel_Get_CurSeg(void) ;
-extern uint8_t Fuel_Get_Percent(void) ;
-
-extern uint16_t Fuel_Get_Res(void) ;
-
-extern uint16_t Fuel_Get_Step(void) ;
-extern uint8_t Fuel_Get_CyrStep(void);
-
-extern uint8_t Fuel_Get_LowAlarm(void);
+extern uint8_t Fuel_Get_CurSeg(void);
+extern uint16_t Fuel_Get_Res(void);
+extern uint16_t Fuel_Get_Step(void);
 #endif