Skip to content

V
VC66_7C
Commit 5e1d7cd9 authored by hu's avatar hu
Browse files
Options

调整报警，调整节油指导相关BUG

parent d28e1146
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 580 additions and 297 deletions
source/Application/APP/Data_Fuel/FuelConfig.h
View file @ 5e1d7cd9
......@@ -7,40 +7,40 @@
//typedef unsigned char INT8_t;
//typedef unsigned int INT32_t;
#define DISPLAY_BOUNDARY_ES 1500
#define DISPLAY_BOUNDARY_1 1500
#define DISPLAY_BOUNDARY_2 1373
#define DISPLAY_BOUNDARY_3 1191
#define DISPLAY_BOUNDARY_4 1009
#define DISPLAY_BOUNDARY_5 848
#define DISPLAY_BOUNDARY_6 697
#define DISPLAY_BOUNDARY_7 545
#define DISPLAY_BOUNDARY_8 436
#define DISPLAY_BOUNDARY_9 345
#define DISPLAY_BOUNDARY_10 254
#define DISPLAY_BOUNDARY_11 188
#define DISPLAY_BOUNDARY_12 132
#define DISPLAY_BOUNDARY_13 84
#define DISPLAY_BOUNDARY_FS 65
#define BOUNDARY_FUEL_ES 0
#define BOUNDARY_FUEL_1 400
#define BOUNDARY_FUEL_2 720
#define BOUNDARY_FUEL_3 860
#define BOUNDARY_FUEL_4 1040
#define BOUNDARY_FUEL_5 1428
#define BOUNDARY_FUEL_6 2577
#define BOUNDARY_FUEL_7 3750
#define BOUNDARY_FUEL_8 4931
#define BOUNDARY_FUEL_9 5536
#define BOUNDARY_FUEL_10 5724
#define BOUNDARY_FUEL_11 6491
#define BOUNDARY_FUEL_12 6850
#define BOUNDARY_FUEL_13 7199
#define BOUNDARY_FUEL_FS 7600
#define FUEL_R_MIN_VAL 40 // 10 X ohm
#define FUEL_R_MAX_VAL 3000 // 10 X ohm
#define DISPLAY_BOUNDARY_ES 1500u
#define DISPLAY_BOUNDARY_1 1500u
#define DISPLAY_BOUNDARY_2 1373u
#define DISPLAY_BOUNDARY_3 1191u
#define DISPLAY_BOUNDARY_4 1009u
#define DISPLAY_BOUNDARY_5 848u
#define DISPLAY_BOUNDARY_6 697u
#define DISPLAY_BOUNDARY_7 545u
#define DISPLAY_BOUNDARY_8 436u
#define DISPLAY_BOUNDARY_9 345u
#define DISPLAY_BOUNDARY_10 254u
#define DISPLAY_BOUNDARY_11 188u
#define DISPLAY_BOUNDARY_12 132u
#define DISPLAY_BOUNDARY_13 84u
#define DISPLAY_BOUNDARY_FS 65u
#define BOUNDARY_FUEL_ES 0u
#define BOUNDARY_FUEL_1 400u
#define BOUNDARY_FUEL_2 720u
#define BOUNDARY_FUEL_3 860u
#define BOUNDARY_FUEL_4 1040u
#define BOUNDARY_FUEL_5 1428u
#define BOUNDARY_FUEL_6 2577u
#define BOUNDARY_FUEL_7 3750u
#define BOUNDARY_FUEL_8 4931u
#define BOUNDARY_FUEL_9 5536u
#define BOUNDARY_FUEL_10 5724u
#define BOUNDARY_FUEL_11 6491u
#define BOUNDARY_FUEL_12 6850u
#define BOUNDARY_FUEL_13 7199u
#define BOUNDARY_FUEL_FS 7600u
#define FUEL_R_MIN_VAL 40u /* 10 X ohm */
#define FUEL_R_MAX_VAL 3000u /* 10 X ohm */
// Fuel Config
typedef struct _FuelStruct
......
source/Application/APP/Data_ODO/Services_ODO_user.c
View file @ 5e1d7cd9
......@@ -61,32 +61,32 @@ void Data_User_Mileage_KL30Init(void)
TripInit[EM_TRIP_B].IsRestart = 1u;
TripInit[EM_TRIP_JY].Stamp = TempBuf[5];
TripInit[EM_TRIP_JY].MaxValue = 99999;
TripInit[EM_TRIP_JY].IsRestart = 1u;
TripInit[EM_TRIP_JY].MaxValue = 999999;
TripInit[EM_TRIP_JY].IsRestart = 0u;
TripInit[EM_TRIP_RY].Stamp = TempBuf[6];
TripInit[EM_TRIP_RY].MaxValue = 99999;
TripInit[EM_TRIP_RY].IsRestart = 1u;
TripInit[EM_TRIP_RY].MaxValue = 999999;
TripInit[EM_TRIP_RY].IsRestart = 0u;
TripInit[EM_TRIP_BSX].Stamp = TempBuf[7];
TripInit[EM_TRIP_BSX].MaxValue = 99999;
TripInit[EM_TRIP_BSX].IsRestart = 1u;
TripInit[EM_TRIP_BSX].MaxValue = 999999;
TripInit[EM_TRIP_BSX].IsRestart = 0u;
TripInit[EM_TRIP_CSQ].Stamp = TempBuf[8];
TripInit[EM_TRIP_CSQ].MaxValue = 99999;
TripInit[EM_TRIP_CSQ].IsRestart = 1u;
TripInit[EM_TRIP_CSQ].MaxValue = 999999;
TripInit[EM_TRIP_CSQ].IsRestart = 0u;
TripInit[EM_TRIP_KQGZJ].Stamp = TempBuf[9];
TripInit[EM_TRIP_KQGZJ].MaxValue = 99999;
TripInit[EM_TRIP_KQGZJ].IsRestart = 1u;
TripInit[EM_TRIP_KQGZJ].MaxValue = 999999;
TripInit[EM_TRIP_KQGZJ].IsRestart = 0u;
TripInit[EM_TRIP_DLZX].Stamp = TempBuf[10];
TripInit[EM_TRIP_DLZX].MaxValue = 99999;
TripInit[EM_TRIP_DLZX].IsRestart = 1u;
TripInit[EM_TRIP_DLZX].MaxValue = 999999;
TripInit[EM_TRIP_DLZX].IsRestart = 0u;
TripInit[EM_TRIP_LT].Stamp = TempBuf[11];
TripInit[EM_TRIP_LT].MaxValue = 99999;
TripInit[EM_TRIP_LT].IsRestart = 1u;
TripInit[EM_TRIP_LT].MaxValue = 999999;
TripInit[EM_TRIP_LT].IsRestart = 0u;
Data_Trip_KL30_Init(DataTripBuf, TripInit, EM_TRIP_MAX, Func.EEPromWrite_Cbk);
}
......
source/Application/APP/Telltales/Telltales_user.c
View file @ 5e1d7cd9
......@@ -1335,6 +1335,8 @@ uint8_t LED_EVSC_L_Judgement(void)
uint8_t m_Condition5 = 0u;
uint16_t m_Condition6 = 0u;
uint16_t m_Condition7 = 0u;
uint8_t m_AirSta1 = 0u;
uint8_t m_AirSta2 = 0u;
CanStatus1 = CAN_MSG_Status(ID_CanMsg18FE4F0B_Msg_Count);
CanStatus2 = CAN_MSG_Status(ID_CanMsg18F0010B_Msg_Count);
......@@ -1345,13 +1347,15 @@ uint8_t LED_EVSC_L_Judgement(void)
m_Condition5 = (uint8_t)Get_ID_18FE4F0B_Sig_VDC_Fully_operational();
m_Condition6 = Common_Get_Air1_Data(); /*气压1 1.89以下*/
m_Condition7 = Common_Get_Air2_Data(); /*气压1 1.89以下*/
m_AirSta1 = Common_Get_Air1_Valid();
m_AirSta2 = Common_Get_Air2_Valid();
/*做个回差，去抖*/
if ((m_Condition6 < 1890u) || (m_Condition7 < 1890u))
if (((m_Condition6 < 1890u) && (m_AirSta1 == 1u)) || ((m_Condition7 < 1890u) && (m_AirSta2 == 1u)))
{
L12_Air_Sta = 1u;
}
else if ((m_Condition6 >= 1990u) && (m_Condition7 >= 1990u))
else if (((m_Condition6 >= 1990u) && (m_Condition7 >= 1990u)) || ((m_AirSta1 == 0u) && (m_AirSta2 == 0u)))
{
L12_Air_Sta = 0u;
}
......
source/Application/Alarm/Popup_List.c
View file @ 5e1d7cd9
This diff is collapsed.
source/Application/Alarm/Popup_Message_List.h
View file @ 5e1d7cd9
......@@ -85,8 +85,20 @@ enum PopupMessageName
消息类型定义
******************************************************************************/
#define POPUP_TYPE_GENERAL 0x00u /*一般消息*/
#define POPUP_TYPE_GENERAL 0x01u /*扭矩限制、车速限制 交互显示*/
#define POPUP_TYPE_ADBULE_ANOMALY 0x02u /*尿素喷射异常(停止、消耗量)交互显示*/
#define POPUP_TYPE_TPMS 0x01u /*胎压消息*/
#define POPUP_TYPE_DOOR 0x02u /*门开消息*/
#define POPUP_TYPE_RADAR 0x03u /*雷达消息*/
#define POPUP_TYPE_SERVICE 0x04u /*保养消息*/
#define POPUP_TYPE_OVSPD 0x05u /*超速消息*/
#define POPUP_TYPE_KEYS 0x06u /*按键激活消息*/
#define POPUP_TYPE_HOOVES 0x07u /*蹄片磨损*/
#define POPUP_TYPE_ADDFUEL 0x08u /*是否已加油*/
#define POPUP_TYPE_KEYBATLOW 0x09u /*钥匙电量低*/
#define POPUP_TYPE_GOHOME 0x0Au /*伴我回家*/
#define POPUP_TYPE_ADASLDSHW 0x0Bu /*方向盘脱手*/
#define POPUP_TYPE_TSR_TR 0x0Cu /*限速标识提醒*/
#define POPUP_TYPE_DRIVING 0x0Du /*本次行驶信息*/
#define POPUP_TYPE_MENU 0x0Eu
/******************************************************************************
伪文字消息列表
......
source/Application/Alarm/Popups.c
View file @ 5e1d7cd9
This diff is collapsed.
source/Application/Graphic/Menu/Menu_user.c
View file @ 5e1d7cd9
......@@ -811,14 +811,14 @@ void Level3_2Menu_8Exit(void)
/*更换机油机油滤清器*/
void Level3_3Menu_1Enter(void)
{
if (User_App.User_FDJYLQQ == 0u)
{
User_set_Num.User_FDJYLQQ = 0u;
}
else
{
User_set_Num.User_FDJYLQQ = (uint32_t)K_Line_Set.K_Line_LID4F * 1000u;
}
//if (User_App.User_FDJYLQQ == 0u)
//{
// User_set_Num.User_FDJYLQQ = 0u;
//}
//else
//{
// User_set_Num.User_FDJYLQQ = (uint32_t)K_Line_Set.K_Line_LID4F * 1000u;
//}
}
void Level3_3Menu_1Do(void)
{
......@@ -850,14 +850,14 @@ void Level3_3Menu_1Exit(void)
/*更换燃油滤清器*/
void Level3_3Menu_2Enter(void)
{
if (User_App.User_RYLQQ == 0u)
{
User_set_Num.User_RYLQQ = 0u;
}
else
{
User_set_Num.User_RYLQQ = (uint32_t)K_Line_User_RYLQQ * 1000u;
}
//if (User_App.User_RYLQQ == 0u)
//{
// User_set_Num.User_RYLQQ = 0u;
//}
//else
//{
// User_set_Num.User_RYLQQ = (uint32_t)K_Line_User_RYLQQ * 1000u;
//}
}
void Level3_3Menu_2Do(void)
{
......@@ -889,14 +889,14 @@ void Level3_3Menu_2Exit(void)
/*更换变速箱油*/
void Level3_3Menu_3Enter(void)
{
if (User_App.User_BSXY == 0u)
{
User_set_Num.User_BSXY = 0u;
}
else
{
User_set_Num.User_BSXY = (uint32_t)K_Line_Set.K_Line_LID4A * 1000;
}
//if (User_App.User_BSXY == 0u)
//{
// User_set_Num.User_BSXY = 0u;
//}
//else
//{
// User_set_Num.User_BSXY = (uint32_t)K_Line_Set.K_Line_LID4A * 1000;
//}
}
void Level3_3Menu_3Do(void)
{
......@@ -928,14 +928,14 @@ void Level3_3Menu_3Exit(void)
/*更换差速器油*/
void Level3_3Menu_4Enter(void)
{
if (User_App.User_CSQY == 0u)
{
User_set_Num.User_CSQY = 0u;
}
else
{
User_set_Num.User_CSQY = (uint32_t)K_Line_Set.K_Line_LID4B * 1000;
}
//if (User_App.User_CSQY == 0u)
//{
// User_set_Num.User_CSQY = 0u;
//}
//else
//{
// User_set_Num.User_CSQY = (uint32_t)K_Line_Set.K_Line_LID4B * 1000;
//}
}
void Level3_3Menu_4Do(void)
{
......@@ -980,14 +980,14 @@ void Level3_3Menu_4Exit(void)
/*更换动力转向液*/
void Level3_3Menu_6Enter(void)
{
if (User_App.User_DLZXY == 0u)
{
User_set_Num.User_DLZXY = 0u;
}
else
{
User_set_Num.User_DLZXY = (uint32_t)K_Line_Set.K_Line_LID4D * 1000;
}
//if (User_App.User_DLZXY == 0u)
//{
// User_set_Num.User_DLZXY = 0u;
//}
//else
//{
// User_set_Num.User_DLZXY = (uint32_t)K_Line_Set.K_Line_LID4D * 1000;
//}
}
void Level3_3Menu_6Do(void)
{
......@@ -1019,14 +1019,14 @@ void Level3_3Menu_6Exit(void)
/*更换轮胎*/
void Level3_3Menu_7Enter(void)
{
if (User_App.User_LT == 0u)
{
User_set_Num.User_LT = 0u;
}
else
{
User_set_Num.User_LT = (uint32_t)K_Line_Set.K_Line_LID4E * 1000;
}
//if (User_App.User_LT == 0u)
//{
// User_set_Num.User_LT = 0u;
//}
//else
//{
// User_set_Num.User_LT = (uint32_t)K_Line_Set.K_Line_LID4E * 1000;
//}
}
void Level3_3Menu_7Do(void)
{
......
source/Application/RTE/Common_Interface.c
View file @ 5e1d7cd9
......@@ -74,6 +74,11 @@ static uint16_t CRUISE_SLD2_Time;
static uint16_t VolWarning_Time;
static uint16_t LOW_VOLTAGE_TIME1;
static uint16_t LOW_VOLTAGE_TIME2;
static uint16_t HIGH_VOLTAGE_TIME1;
static uint16_t HIGH_VOLTAGE_TIME2;
static uint16_t HIGH_VOLTAGE;
static uint16_t LOW_VOLTAGE;
......@@ -110,6 +115,10 @@ void Common_DataInit(void)
CRUISE_SLD2_Time = 0x00u;
VolWarning_Time = 0x00u;
LOW_VOLTAGE_TIME1 = 0x00u;
LOW_VOLTAGE_TIME2 = 0x00u;
HIGH_VOLTAGE_TIME1 = 0x00u;
HIGH_VOLTAGE_TIME2 = 0x00u;
HIGH_VOLTAGE = 0x0u;
LOW_VOLTAGE = 0x0u;
}
......@@ -158,6 +167,36 @@ uint8_t Common_Get_OverSpeed_Status(void)
return OverSpeedStatus;
}
uint8_t Common_Get_OverSpeedLine_Status(void)
{
uint8_t OverSpeedStatus = 0u;
uint16_t DispVSpeed = 0u;
uint16_t DataOverSpeedValue = 0u;
DataOverSpeedValue = K_Line_Set.K_Line_LID44;
DataOverSpeedValue *= 10u;
DispVSpeed = Common_Get_Disp_V_Speed();
if (K_Line_Set.K_Line_LID44 != 0xFF)
{
if (DispVSpeed >= (DataOverSpeedValue + 20))
{
OverSpeedStatus = 1u;
}
else if (DispVSpeed <= DataOverSpeedValue)
{
OverSpeedStatus = 0u;
}
}
else
{
OverSpeedStatus = 0u;
}
return OverSpeedStatus;
}
static void Common_Set_IG_Sts(COMMON_PowerStatus_t Val)
{
PowerSts = Val;
......@@ -272,7 +311,7 @@ void Common_Input_Para(void)
{
if (VolWarning_Time <= 5100)
{
VolWarning_Time ++;
VolWarning_Time++;
}
}
else
......@@ -280,10 +319,59 @@ void Common_Input_Para(void)
VolWarning_Time = 0;
}
/**/
if (RTE_Read_KL15_Voltage() <= 23500) /*A2*/
{
if (LOW_VOLTAGE_TIME1 <= 3500)
LOW_VOLTAGE_TIME1++;
else
LOW_VOLTAGE = 1;
}
else
{
LOW_VOLTAGE_TIME1 = 0;
}
if (RTE_Read_KL15_Voltage() >= 25000) /*A2*/
{
if (LOW_VOLTAGE_TIME2 <= 5000)
LOW_VOLTAGE_TIME2++;
else
LOW_VOLTAGE = 0;
}
else
{
LOW_VOLTAGE_TIME2 = 0;
}
//
if (RTE_Read_KL15_Voltage() >= 30400) /*A2*/
{
if (HIGH_VOLTAGE_TIME1 <= 3500)
HIGH_VOLTAGE_TIME1++;
else
HIGH_VOLTAGE = 1;
}
else
{
HIGH_VOLTAGE_TIME1 = 0;
}
if (RTE_Read_KL15_Voltage() <= 29400) /*A2*/
{
if (HIGH_VOLTAGE_TIME2 <= 5000)
HIGH_VOLTAGE_TIME2++;
else
HIGH_VOLTAGE = 0;
}
else
{
HIGH_VOLTAGE_TIME2 = 0;
}
/**/
if ((State_Flag.User_FDJYLQQ_FLAG == 1) || (State_Flag.User_FDJYLQQ_FLAG == 2))
{
if (User_FDJYLQQ_Time < 601)
if (User_FDJYLQQ_Time < 30001)
User_FDJYLQQ_Time++;
}
else
......@@ -293,7 +381,7 @@ void Common_Input_Para(void)
if ((State_Flag.User_RYLQQ_FLAG == 1) || (State_Flag.User_RYLQQ_FLAG == 2))
{
if (User_RYLQQ_Time < 601)
if (User_RYLQQ_Time < 30001)
User_RYLQQ_Time++;
}
else
......@@ -303,7 +391,7 @@ void Common_Input_Para(void)
if ((State_Flag.User_BSXY_FLAG == 1) || (State_Flag.User_BSXY_FLAG == 2))
{
if (User_BSXY_Time < 601)
if (User_BSXY_Time < 30001)
User_BSXY_Time++;
}
else
......@@ -313,7 +401,7 @@ void Common_Input_Para(void)
if ((State_Flag.User_CSQY_FLAG == 1) || (State_Flag.User_CSQY_FLAG == 2))
{
if (User_CSQY_Time < 601)
if (User_CSQY_Time < 30001)
User_CSQY_Time++;
}
else
......@@ -323,7 +411,7 @@ void Common_Input_Para(void)
if ((State_Flag.User_LHQY_FLAG == 1) || (State_Flag.User_LHQY_FLAG == 2))
{
if (User_LHQY_Time < 601)
if (User_LHQY_Time < 30001)
User_LHQY_Time++;
}
else
......@@ -333,7 +421,7 @@ void Common_Input_Para(void)
if ((State_Flag.User_KQGZJ_FLAG == 1) || (State_Flag.User_KQGZJ_FLAG == 2))
{
if (User_KQGZJ_Time < 601)
if (User_KQGZJ_Time < 30001)
User_KQGZJ_Time++;
}
else
......@@ -343,7 +431,7 @@ void Common_Input_Para(void)
if ((State_Flag.User_DLZXY_FLAG == 1) || (State_Flag.User_DLZXY_FLAG == 2))
{
if (User_DLZXY_Time < 601)
if (User_DLZXY_Time < 30001)
User_DLZXY_Time++;
}
else
......@@ -353,7 +441,7 @@ void Common_Input_Para(void)
if ((State_Flag.User_LT_FLAG == 1) || (State_Flag.User_LT_FLAG == 2))
{
if (User_LT_Time < 601)
if (User_LT_Time < 30001)
User_LT_Time++;
}
else
......@@ -364,7 +452,7 @@ void Common_Input_Para(void)
/**/
if (Get_ID_18FF4100_Sig_Cruise_VariableSLD_Disp() == 1u)
{
if (CRUISE_1_Time < 1500u)
if (CRUISE_1_Time < 1501u)
{
CRUISE_1_Time++;
}
......@@ -375,7 +463,7 @@ void Common_Input_Para(void)
}
if (Get_ID_18FF4100_Sig_Cruise_VariableSLD_Disp() == 2u)
{
if (CRUISE_STUDY_Time < 1500u)
if (CRUISE_STUDY_Time < 1501u)
{
CRUISE_STUDY_Time++;
}
......@@ -386,7 +474,7 @@ void Common_Input_Para(void)
}
if (Get_ID_18FF4100_Sig_Cruise_VariableSLD_Disp() == 3u)
{
if (CRUISE_SLD1_Time < 1500u)
if (CRUISE_SLD1_Time < 1501u)
{
CRUISE_SLD1_Time++;
}
......@@ -395,9 +483,6 @@ void Common_Input_Para(void)
{
CRUISE_SLD1_Time = 0;
}
}
else
{
......@@ -417,15 +502,27 @@ void Common_Input_Para(void)
Common_Set_Disp_E_Speed(0u);
/*----*/
User_FDJYLQQ_Time = 0u;
User_RYLQQ_Time = 0u;
User_BSXY_Time = 0u;
User_CSQY_Time = 0u;
User_LHQY_Time = 0u;
User_KQGZJ_Time = 0u;
User_DLZXY_Time = 0u;
User_LT_Time = 0u;
/*----*/
User_FDJYLQQ_Time = 0x00u;
User_RYLQQ_Time = 0x00u;
User_BSXY_Time = 0x00u;
User_CSQY_Time = 0x00u;
User_LHQY_Time = 0x00u;
User_KQGZJ_Time = 0x00u;
User_DLZXY_Time = 0x00u;
User_LT_Time = 0x00u;
CRUISE_1_Time = 0x00u;
CRUISE_STUDY_Time = 0x00u;
CRUISE_SLD1_Time = 0x00u;
CRUISE_SLD2_Time = 0x00u;
VolWarning_Time = 0x00u;
LOW_VOLTAGE_TIME1 = 0x00u;
LOW_VOLTAGE_TIME2 = 0x00u;
HIGH_VOLTAGE_TIME1 = 0x00u;
HIGH_VOLTAGE_TIME2 = 0x00u;
HIGH_VOLTAGE = 0x0u;
LOW_VOLTAGE = 0x0u;
}
}
......@@ -534,7 +631,7 @@ uint8_t Common_Get_Cruise_SLD_TimeSta(void)
return Time_Sta;
}
uint8_t Common_VolWarning_Sta(void)
uint8_t Common_Get_VolWarning_Sta(void)
{
uint8_t DataHiCollantVolWarning = 0u;
......@@ -547,7 +644,145 @@ uint8_t Common_VolWarning_Sta(void)
DataHiCollantVolWarning = 0u;
}
return DataHiCollantVolWarning ;
return DataHiCollantVolWarning;
}
uint8_t Common_Get_HIGH_VOLTAGE(void)
{
return HIGH_VOLTAGE;
}
uint8_t Common_Get_LOW_VOLTAGE(void)
{
return LOW_VOLTAGE;
}
uint8_t Common_Get_FDJYLQQ_Sta(void)
{
uint8_t ValueSta = 0u;
if (User_FDJYLQQ_Time < 30000u)
{
ValueSta = 1u;
}
else
{
ValueSta = 0u;
}
return ValueSta;
}
uint8_t Common_Get_RYLQQ_Sta(void)
{
uint8_t ValueSta = 0u;
if (User_RYLQQ_Time < 30000u)
{
ValueSta = 1u;
}
else
{
ValueSta = 0u;
}
return ValueSta;
}
uint8_t Common_Get_BSXY_Sta(void)
{
uint8_t ValueSta = 0u;
if (User_BSXY_Time < 30000u)
{
ValueSta = 1u;
}
else
{
ValueSta = 0u;
}
return ValueSta;
}
uint8_t Common_Get_CSQY_Sta(void)
{
uint8_t ValueSta = 0u;
if (User_CSQY_Time < 30000u)
{
ValueSta = 1u;
}
else
{
ValueSta = 0u;
}
return ValueSta;
}
uint8_t Common_Get_LHQY_Sta(void)
{
uint8_t ValueSta = 0u;
if (User_LHQY_Time < 30000u)
{
ValueSta = 1u;
}
else
{
ValueSta = 0u;
}
return ValueSta;
}
uint8_t Common_Get_KQGZJ_Sta(void)
{
uint8_t ValueSta = 0u;
if (User_KQGZJ_Time < 30000u)
{
ValueSta = 1u;
}
else
{
ValueSta = 0u;
}
return ValueSta;
}
uint8_t Common_Get_DLZXY_Sta(void)
{
uint8_t ValueSta = 0u;
if (User_DLZXY_Time < 30000u)
{
ValueSta = 1u;
}
else
{
ValueSta = 0u;
}
return ValueSta;
}
uint8_t Common_Get_LT_Sta(void)
{
uint8_t ValueSta = 0u;
if (User_LT_Time < 30000u)
{
ValueSta = 1u;
}
else
{
ValueSta = 0u;
}
return ValueSta;
}
/*EOL诊断配置数据转换为仪表配置数据*/
......@@ -611,4 +846,4 @@ void K_LINE_EOL_InitVal(void)
K_Line_Set.K_Line_LID50 = 0x00u; /* -- 预留 */
K_Line_Set.K_Line_LID51 = 0x01u; /* 01 工作模式 */
K_Line_Set.K_Line_LID52 = 0x00u; /* 00 电子部件设定 */
}
\ No newline at end of file
}
source/Application/RTE/Common_Interface.h
View file @ 5e1d7cd9
......@@ -107,7 +107,7 @@ extern uint16_t Common_Get_Act_E_Speed(void);
extern uint16_t Common_Get_Disp_V_Speed(void);
extern uint16_t Common_Get_Disp_E_Speed(void);
extern uint8_t Common_Get_OverSpeed_Status(void); /*获取超速报警状态*/
extern uint8_t Common_Get_Disp_E_Status(void); /*获取转速不在经济区状态*/
extern uint8_t Common_Get_OverSpeedLine_Status(void);
extern DataValid_t Common_Get_Act_V_Speed_Valid(void);
extern DataValid_t Common_Get_Act_E_Speed_Valid(void);
......@@ -129,7 +129,17 @@ uint8_t Get_CanFirstRecv_Event(uint8_t ID);
uint8_t Common_Get_Cruise_TimeSta(void);
uint8_t Common_Get_Cruise_SLD_TimeSta(void);
uint8_t Common_VolWarning_Sta(void);
uint8_t Common_Get_VolWarning_Sta(void);
uint8_t Common_Get_HIGH_VOLTAGE (void);
uint8_t Common_Get_LOW_VOLTAGE (void);
uint8_t Common_Get_FDJYLQQ_Sta (void);
uint8_t Common_Get_RYLQQ_Sta (void);
uint8_t Common_Get_BSXY_Sta (void);
uint8_t Common_Get_CSQY_Sta (void);
uint8_t Common_Get_LHQY_Sta (void);
uint8_t Common_Get_KQGZJ_Sta (void);
uint8_t Common_Get_DLZXY_Sta (void);
uint8_t Common_Get_LT_Sta (void);
void ReadDTCEOLValue_Meter_K_LINE(void);
void K_LINE_EOL_InitVal(void);
......
source/System/tasks.c
View file @ 5e1d7cd9
......@@ -260,6 +260,7 @@ void Sys_Exact_50us_Tasks(void)
SEG_LCD_Window_Control_Service();
}
Buzzer_Play_ISR();
Data_Mileage_ISR();
}
/*============================================================================*/
......@@ -273,7 +274,7 @@ void Sys_Exact_50us_Tasks(void)
------------------------------------------------------------------------------*/
void Sys_Exact_100ms_Tasks(void)
{
Data_Mileage_ISR();
//Data_Mileage_ISR();
Service_OFF_Timing_Process();
Fuel_User_KL15_OFF_Processing_Service();
}
......
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