Skip to content

V
VC66_7C
Commit 1b397935 authored by hu's avatar hu
Browse files
Options

调整所有硬线采集走硬线SERVER

parent 6453ca2a
Hide whitespace changes
Inline Side-by-side
Showing with 63 additions and 13 deletions
source/Application/APP/LINE_IN/Line_In.h
View file @ 1b397935
......@@ -40,6 +40,10 @@ typedef enum
LINE_IN_LOW_COOLANT, /*B32 LOW_COOLANT*/
LINE_IN_ACC, /*B39 ACC*/
LINE_IN_WEAR2, /*B40 WEAR2*/
LINE_IN_A19, /*A19 */
LINE_IN_A03, /*A03 */
LINE_IN_A20, /*A20 */
LINE_IN_MAX,
} Line_In_Channel_en_t;
......
source/Application/APP/LINE_IN/Line_In_user.c
View file @ 1b397935
......@@ -35,6 +35,9 @@ LINE_IN_TriggerLevel_en_t LINE_IN_Get_TRAILER_CONNECT(void); /*B06 TRAILER_CONN
LINE_IN_TriggerLevel_en_t LINE_IN_Get_LOW_COOLANT(void); /*B32 LOW_COOLANT*/
LINE_IN_TriggerLevel_en_t LINE_IN_Get_ACC(void); /*B39 ACC*/
LINE_IN_TriggerLevel_en_t LINE_IN_Get_WEAR2(void); /*B40 WEAR2*/
LINE_IN_TriggerLevel_en_t LINE_IN_Get_A19(void); /*A19 */
LINE_IN_TriggerLevel_en_t LINE_IN_Get_A03(void); /*A03 */
LINE_IN_TriggerLevel_en_t LINE_IN_Get_A20(void); /*A20 */
/*属性表与硬线索引号Line_In_Channel_en_t一一对应*/
const Line_In_Attribute_st_t g_stLineInAttribute[LINE_IN_MAX] =
......@@ -70,6 +73,9 @@ const Line_In_Attribute_st_t g_stLineInAttribute[LINE_IN_MAX] =
{ LINE_IN_LEVEL_LOW, 200U, 0U, LINE_IN_IG_ON, LINE_IN_Get_LOW_COOLANT,}, /*B32 LOW_COOLANT*/
{ LINE_IN_LEVEL_HIGH, 200U, 0U, LINE_IN_IG_ON, LINE_IN_Get_ACC,}, /*B39 ACC*/
{ LINE_IN_LEVEL_LOW, 200U, 0U, LINE_IN_IG_ON, LINE_IN_Get_WEAR2,}, /*B40 WEAR2*/
{ LINE_IN_LEVEL_HIGH, 200U, 0U, LINE_IN_IG_ON, LINE_IN_Get_A19,}, /*A19 */
{ LINE_IN_LEVEL_HIGH, 200U, 0U, LINE_IN_IG_ON, LINE_IN_Get_A03,}, /*A03 */
{ LINE_IN_LEVEL_LOW, 200U, 0U, LINE_IN_IG_ON, LINE_IN_Get_A20,}, /*A20 */
};
/*A22 ABS*/
......@@ -296,6 +302,30 @@ LINE_IN_TriggerLevel_en_t LINE_IN_Get_WEAR2(void)
return Res;
}
/*A19*/
LINE_IN_TriggerLevel_en_t LINE_IN_Get_A19(void)
{
LINE_IN_TriggerLevel_en_t Res = CD4051_COM3_X0_IN;
return Res;
}
/*A03*/
LINE_IN_TriggerLevel_en_t LINE_IN_Get_A03(void)
{
LINE_IN_TriggerLevel_en_t Res = CD4051_COM3_X7_IN;
return Res;
}
/*A20*/
LINE_IN_TriggerLevel_en_t LINE_IN_Get_A20(void)
{
LINE_IN_TriggerLevel_en_t Res = CD4051_COM3_X5_IN;
return Res;
}
/*A23 PARK BRAKE*/
/*A25 HI BEAM*/
/*A28 BRAKE AIR/EBS*/
......
source/Application/Alarm/Popups.c
View file @ 1b397935
......@@ -1241,7 +1241,10 @@ void Popup_Alone_Sound_Server(void)
Sound_Delete(SND_Key_Notremoved);
/*01 制动*/
if ((CD4051_COM1_X4_IN == 0u) && (CD4051_COM1_X7_IN == 1u))
//if ((CD4051_COM1_X4_IN == 0u) && (CD4051_COM1_X7_IN == 1u))
if (
(Line_In_Get_Status(LINE_IN_BRAKE) == LINE_IN_LOGIC_VALID) &&
(Line_In_Get_Status(LINE_IN_PARK_BRAKE) == LINE_IN_LOGIC_INVALID))
{
Sound_Request(SND_Braking, 1u);
}
......@@ -1252,7 +1255,10 @@ void Popup_Alone_Sound_Server(void)
/*02 制动气压*/
variable_1 = Common_Get_L12_Air_Sta();
if ((variable_1 == 1u) || (CD4051_COM2_X7_IN == 0u))
//if ((variable_1 == 1u) || (CD4051_COM2_X7_IN == 0u))
if (
(variable_1 == 1u) ||
((Line_In_Get_Status(LINE_IN_BRAKE_AIR_EBS) == LINE_IN_LOGIC_VALID)))
{
Sound_Request(SND_Air_Brake, 1u);
}
......@@ -1303,7 +1309,8 @@ void Popup_Alone_Sound_Server(void)
}
/*07 冷却水量*/
if (CD4051_COM5_X4_IN == 0u)
//if (CD4051_COM5_X4_IN == 0u)
if (Line_In_Get_Status(LINE_IN_LOW_COOLANT) == LINE_IN_LOGIC_VALID)
{
Sound_Request(SND_Coolant_Low, 1u);
}
......@@ -1327,7 +1334,10 @@ void Popup_Alone_Sound_Server(void)
}
/*09 ACC AIR*/
if ((CD4051_COM7_X0_IN == 0u) && (CD4051_COM1_X7_IN == 1u))
//if ((CD4051_COM7_X0_IN == 0u) && (CD4051_COM1_X7_IN == 1u))
if (
(Line_In_Get_Status(LINE_IN_ACC_AIR) == LINE_IN_LOGIC_VALID) &&
(Line_In_Get_Status(LINE_IN_PARK_BRAKE) == LINE_IN_LOGIC_INVALID))
{
Sound_Request(SND_ACC_AIR, 1u);
}
......@@ -1337,7 +1347,8 @@ void Popup_Alone_Sound_Server(void)
}
/*10 倒车警报*/
if (CD4051_COM3_X0_IN == 1u)
//if (CD4051_COM3_X0_IN == 1u)
if (Line_In_Get_Status(LINE_IN_A19) == LINE_IN_LOGIC_VALID)
{
Sound_Request(SND_BackUP_SPEED, 1u);
}
......@@ -1494,7 +1505,10 @@ void Popup_Alone_Sound_Server(void)
/*19 安全带*/
V_Speed = Common_Get_Disp_V_Speed(); /*车速*/
if ((CD4051_COM2_X3_IN == 0u) && (V_Speed > DISPSPEEDNULLMAX))
//if ((CD4051_COM2_X3_IN == 0u) && (V_Speed > DISPSPEEDNULLMAX))
if (
(Line_In_Get_Status(LINE_IN_SEAT_BELT) == LINE_IN_LOGIC_VALID) &&
(V_Speed > DISPSPEEDNULLMAX))
{
Sound_Request(SND_SEATBELT_SPEED, 1u);
}
......@@ -1519,7 +1533,8 @@ void Popup_Alone_Sound_Server(void)
{
/*A3-28 A20-GND B39-OPEN A2-OPEN*/
variable_1 = Line_In_Get_Status(LINE_IN_ACC);
if ((CD4051_COM3_X7_IN == 1u) && (CD4051_COM3_X5_IN == 0u) && (variable_1 == 0u))
//if ((CD4051_COM3_X7_IN == 1u) && (CD4051_COM3_X5_IN == 0u) && (variable_1 == 0u))
if (0)
{
Sound_Request(SND_Key_Notremoved, 1u); /*00 忘拔钥匙*/
}
......
source/Application/CAN_APP_NM/CAN_App/CAN_FUNC.c
View file @ 1b397935
......@@ -564,7 +564,8 @@ void Can_Set_Buff_18FF2A17(uint8_t CopyData[])
}
/*冷却水不足外发报文*/
if (CD4051_COM5_X4_IN == 0)
//if (CD4051_COM5_X4_IN == 0)
if (Line_In_Get_Status(LINE_IN_LOW_COOLANT) == LINE_IN_LOGIC_VALID)
{
SW_Coolant_Level = 1u;
}
......@@ -605,8 +606,8 @@ void Can_Set_Buff_18FF2A17(uint8_t CopyData[])
/*钥匙状态*/
/*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_A03) == 1) &&
(Line_In_Get_Status(LINE_IN_A20) == 1) &&
(Line_In_Get_Status(LINE_IN_ACC) == 0u) &&
(Common_Get_IG_Sts() != COMMON_POWER_ON)
)
......
source/Application/Graphic/GUI/GUI.c
View file @ 1b397935
......@@ -743,8 +743,8 @@ void GUI_WetGas_Dispaly(uint8_t Mode)
}
else
{
//GUI_General_Display(WET_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
GUI_General_Display(WET_Sprite, CN_qiyafuhaodeng, GUI_BLENDMODE_SRC_OVER);
GUI_General_Display(WET_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
//GUI_General_Display(WET_Sprite, CN_qiyafuhaodeng, GUI_BLENDMODE_SRC_OVER);
}
}
else
......@@ -10343,7 +10343,7 @@ void Gui_Display_Test(void)
Get_Data_Rev_value = GetGaugesCurrentPos(RevGauges) ;
Get_Data_Rev_valueMax = GetGaugesMaxOutVal(RevGauges) ;
//if (( Get_Data_Veh_value >= Get_Data_Veh_valueMax ) && ( Get_Data_Rev_value >= Get_Data_Rev_valueMax ))
if (( Get_Data_Veh_value >= Get_Data_Veh_valueMax ) && ( Get_Data_Rev_value >= Get_Data_Rev_valueMax ))
{
while (1)
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment