Merge branch 'wangyanan' into 'dev'

✨ feat:灯和硬线部分完成代码编写

See merge request !17

Firmware/Source/Component/Line_In/Line_In_user.c

@@ -14,8 +14,7 @@ const Line_In_Attribute_st g_stLineInAttribute[LINE_IN_MAX] =
     {LEVEL_HIGH,    LEVEL_LOW,   LINE_IN_IG_ON,     20U,  20U,  Get_LINE_IN_Oil_Pressure_Alert, },
     {LEVEL_HIGH,    LEVEL_LOW,   LINE_IN_IG_ON,     20U,  20U,  Get_LINE_IN_Voltage,          },
     {LEVEL_HIGH,    LEVEL_LOW,   LINE_IN_IG_ON,     20U,  20U,  Get_LINE_IN_Fuel_Level_Low,   },
-    {LEVEL_HIGH,    LEVEL_LOW,   LINE_IN_IG_ON,     20U,  20U,  Get_LINE_IN_E,                },
-    {LEVEL_HIGH,    LEVEL_LOW,   LINE_IN_IG_ON,     20U,  20U,  Get_LINE_IN_S,                },
+    {LEVEL_LOW,    LEVEL_HIGH,   LINE_IN_IG_ON,     20U,  20U,  Get_LINE_IN_Coolant_Temperature },  
 };
 Linelib_uint8_t Get_LINE_IN_Turn_Left(void)
 {
@@ -46,7 +45,7 @@ Linelib_uint8_t Get_LINE_IN_Turn_Right(void)
 Linelib_uint8_t Get_LINE_IN_High_Beam(void)
 {
     Linelib_uint8_t ret = 0U;
-    if (RTE_GPIO_Get_Level(HighBeam_P_In))
+    if (RTE_GPIO_Get_Level(HighBeam_MCU))
     {
         ret = 1u;
     }
@@ -85,7 +84,7 @@ Linelib_uint8_t Get_LINE_IN_ABS(void)
 Linelib_uint8_t Get_LINE_IN_Auto_Start_Stop(void)
 {
     Linelib_uint8_t ret = 0U;
-    if (RTE_GPIO_Get_Level(LeftTurn_MUC_OUT))
+    if (RTE_GPIO_Get_Level(Start_stop_MCU))
     {
         ret = 1u;
     }
@@ -98,7 +97,7 @@ Linelib_uint8_t Get_LINE_IN_Auto_Start_Stop(void)
 Linelib_uint8_t Get_LINE_IN_Oil_Pressure_Alert(void)
 {
     Linelib_uint8_t ret = 0U;
-    if (RTE_GPIO_Get_Level(LeftTurn_MUC_OUT))
+    if (RTE_GPIO_Get_Level(Gears_N_MCU))
     {
         ret = 1u;
     }
@@ -110,47 +109,34 @@ Linelib_uint8_t Get_LINE_IN_Oil_Pressure_Alert(void)
 }
 Linelib_uint8_t Get_LINE_IN_Voltage(void)
 {
-    Linelib_uint8_t ret = 0U;
-    if (RTE_GPIO_Get_Level(LeftTurn_MUC_OUT))
-    {
-        ret = 1u;
-    }
-    else
-    {
-        ret = 0UL;
-    }
-    return ret;
+    // Linelib_uint8_t ret = 0U;
+    // if (RTE_GPIO_Get_Level(LeftTurn_MUC_OUT))/*没找到电压指示灯*/
+    // {
+    //     ret = 1u;
+    // }
+    // else
+    // {
+    //     ret = 0UL;
+    // }
+    // return ret;
 }
 Linelib_uint8_t Get_LINE_IN_Fuel_Level_Low(void)
 {
-    Linelib_uint8_t ret = 0U;
-    if (RTE_GPIO_Get_Level(LeftTurn_MUC_OUT))
-    {
-        ret = 1u;
-    }
-    else
-    {
-        ret = 0UL;
-    }
-    return ret;
-}
-Linelib_uint8_t Get_LINE_IN_E(void)
-{
-    Linelib_uint8_t ret = 0U;
-    if (RTE_GPIO_Get_Level(LeftTurn_MUC_OUT))
-    {
-        ret = 1u;
-    }
-    else
-    {
-        ret = 0UL;
-    }
-    return ret;
+    // Linelib_uint8_t ret = 0U;
+    // if (RTE_GPIO_Get_Level(LeftTurn_MUC_OUT))/*修改指示灯*/
+    // {
+    //     ret = 1u;
+    // }
+    // else
+    // {
+    //     ret = 0UL;
+    // }
+    // return ret;
 }
-Linelib_uint8_t Get_LINE_IN_S(void)
+Linelib_uint8_t Get_LINE_IN_Coolant_Temperature(void)
 {
     Linelib_uint8_t ret = 0U;
-    if (RTE_GPIO_Get_Level(LeftTurn_MUC_OUT))
+    if (RTE_GPIO_Get_Level(A_WaterTemp_IN))
     {
         ret = 1u;
     }
@@ -161,6 +147,8 @@ Linelib_uint8_t Get_LINE_IN_S(void)
     return ret;
 }
 
+
+
 __align(4)
 Linelib_uint8_t LINE_IN_Men[LINE_IN_MAX * LINE_IN_BLOCK_SIZE];
 

Firmware/Source/Component/Line_In/Line_In_user.h

@@ -14,8 +14,8 @@ typedef enum
     LINE_IN_Oil_Pressure_Alert,
     LINE_IN_Voltage,
     LINE_IN_Fuel_Level_Low,
-    LINE_IN_E,
-    LINE_IN_S,
+    LINE_IN_Coolant_Temperature,
+
     LINE_IN_MAX,
 } LINE_IN_Enum_t;
 
@@ -30,6 +30,5 @@ Linelib_uint8_t Get_LINE_IN_Auto_Start_Stop(void);
 Linelib_uint8_t Get_LINE_IN_Oil_Pressure_Alert(void);
 Linelib_uint8_t Get_LINE_IN_Voltage(void);
 Linelib_uint8_t Get_LINE_IN_Fuel_Level_Low(void);
-Linelib_uint8_t Get_LINE_IN_E(void);
-Linelib_uint8_t Get_LINE_IN_S(void);
+Linelib_uint8_t Get_LINE_IN_Coolant_Temperature(void);
 #endif