Skip to content

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

Merge branch 'development' into withBoot

parents 1233d837 49df5f81
Hide whitespace changes
Inline Side-by-side
Showing with 305 additions and 120 deletions
source/Application/APP/BackLight/BackLight_APP.c
View file @ ed652700
......@@ -104,7 +104,7 @@ void BL_Management_service(void)
Get_Menu_Off_Time = Coom_Get_Menu_Off_Time();
//if (BackLightOFF_TIME < 3000)
if ((State_Flag.Menu_Key_Static == 1u) && (Get_Menu_Off_Time < 150000))
if ((State_Flag.Menu_Key_Static == 1u) && (Get_Menu_Off_Time < 7500))
{
BackLightOFF_TIME++;
......
source/Application/APP/Key/Key_user.c
View file @ ed652700
......@@ -247,10 +247,10 @@ void Key_Operation_Up(Key_Event_en_t enKeyEvent)
/*语言设置 ----反*/
else if (bCurMenuIDX == _MN_DSP_LEVEL3_4_MENU_3)
{
if (User_set_Num.User_Language > 0u)
{
User_set_Num.User_Language--;
}
//if (User_set_Num.User_Language > 0u)
//{
// User_set_Num.User_Language--;
//}
}
/*胎压匹配界面*/
else if (bCurMenuIDX == _MN_DSP_LEVEL3_4_MENU_5)
......@@ -758,8 +758,8 @@ void Key_Operation_Down(Key_Event_en_t enKeyEvent)
/*语言设置 ----反*/
else if (bCurMenuIDX == _MN_DSP_LEVEL3_4_MENU_3)
{
if (User_set_Num.User_Language < 1)
User_set_Num.User_Language++;
//if (User_set_Num.User_Language < 1)
// User_set_Num.User_Language++;
}
/*胎压匹配界面*/
else if (bCurMenuIDX == _MN_DSP_LEVEL3_4_MENU_5)
......
source/Application/APP/PowerManagement/PowerManagement.c
View file @ ed652700
......@@ -23,10 +23,11 @@ void Power_Management_Service ( void )
{
switch ( g_Power_St )
{
case m_IGN_Wakeup:
case m_IGN_OFF_Init:
Power_IG_OFF_Init();
g_Power_St = m_IGN_OFF;
break;
//break;
case m_IGN_OFF:
g_Power_St = Power_Stay_OFF();
break;
......@@ -40,7 +41,7 @@ void Power_Management_Service ( void )
case m_IGN_ON_Init:
Power_IG_ON_Init();
g_Power_St = m_IGN_ON;
break;
//break;
case m_IGN_ON:
g_Power_St = Power_Stay_ON();
break;
......
source/Application/APP/PowerManagement/PowerManagement_user.c
View file @ ed652700
......@@ -322,7 +322,7 @@ Power_Status_t Power_Stay_OFF(void)
if (
(PowerGetNMStatus() == POWER_NM_SLEEP) &&
(LED_WAKEUP == LEVEL_LOW) &&
(Get_Menu_Off_Time >= 150100u)
(Get_Menu_Off_Time >= 7600u)
)
{
u8PowerSts = m_IGN_Sleep_Init;
......
source/Application/APP/SEG_LCD/SEG_DISPLAY.c
View file @ ed652700
......@@ -559,7 +559,7 @@ static void SEG_VehicleSpeed_Num(uint16_t Value, uint8_t Valid)
static void SEG_PRI_Display(uint8_t Value, uint8_t Valid, uint8_t seg_status)
{
uint8_t i;
static OldValue = 0xff;
static uint8_t OldValue = 0xff;
static uint8_t mSEG[PRI_SEG_NUM_MAX] = {0};
SEG_BUFF_Set(BU98_CHIP1, SEG_REDEFINE_95, seg_status); // A63
SEG_BUFF_Set(BU98_CHIP1, SEG_REDEFINE_96, seg_status); // A64
......@@ -637,7 +637,7 @@ static void SEG_PRI_Display(uint8_t Value, uint8_t Valid, uint8_t seg_status)
static void SEG_SEC_Display(uint8_t Value, uint8_t Valid, uint8_t seg_status)
{
uint8_t i;
static OldValue = 0xff;
static uint8_t OldValue = 0xff;
static uint8_t mSEG[SEC_SEG_NUM_MAX] = {0};
SEG_BUFF_Set(BU98_CHIP0, SEG_REDEFINE_68, seg_status); // B5
SEG_BUFF_Set(BU98_CHIP0, SEG_REDEFINE_69, seg_status); // B6
......
source/Application/Alarm/Popup_List.c
View file @ ed652700
......@@ -75,17 +75,17 @@ const Popup_Attribute_t PopupAttributeTable[POPUP_MAX] =
{/*54 POPUP8_DPD_AUTO */ POPUP_TYPE_WARNING , 3u, 0u, POPUP_IGN_ON, POPUP8_DPD_AUTO , NULL, 1u, POPUP8_MSG_DPD_AUTO , POPUP_MODE_MULTI, SND_NONE , SND_TYPE_MULTI,},
{/*55 POPUP9_AIR_PRESSURE */ POPUP_TYPE_WARNING , 3u, 0u, POPUP_IGN_ON, POPUP9_AIR_PRESSURE , NULL, 1u, POPUP9_MSG_AIR_PRESSURE , POPUP_MODE_MULTI, SND_NONE , SND_TYPE_MULTI,},
{/*56 POPUP9_EBS_ERROR */ POPUP_TYPE_WARNING , 3u, 0u, POPUP_IGN_ON, POPUP9_EBS_ERROR , NULL, 1u, POPUP9_MSG_EBS_ERROR , POPUP_MODE_MULTI, SND_NONE , SND_TYPE_MULTI,},
{/*57 POPUP10_RAPID_ACC */ POPUP_TYPE_WARNING , 4u, 0u, POPUP_IGN_ON, POPUP10_RAPID_ACC , NULL, 1u, POPUP10_MSG_RAPID_ACC , POPUP_MODE_MULTI, SND_NONE , SND_TYPE_MULTI,},
{/*58 POPUP10_RAPID_SUB */ POPUP_TYPE_WARNING , 4u, 0u, POPUP_IGN_ON, POPUP10_RAPID_SUB , NULL, 1u, POPUP10_MSG_RAPID_SUB , POPUP_MODE_MULTI, SND_NONE , SND_TYPE_MULTI,},
{/*59 POPUP10_REVAL_ENGINE */ POPUP_TYPE_WARNING , 4u, 0u, POPUP_IGN_ON, POPUP10_REVAL_ENGINE , NULL, 1u, POPUP10_MSG_REVAL_ENGINE , POPUP_MODE_MULTI, SND_NONE , SND_TYPE_MULTI,},
{/*60 POPUP10_REVAL_SPEED */ POPUP_TYPE_WARNING , 4u, 0u, POPUP_IGN_ON, POPUP10_REVAL_SPEED , NULL, 1u, POPUP10_MSG_REVAL_SPEED , POPUP_MODE_MULTI, SND_NONE , SND_TYPE_MULTI,},
{/*61 POPUP11_ENGINE_OIL_FILTER */ POPUP_TYPE_WARNING , 5u, 0u, POPUP_IGN_ON, POPUP11_ENGINE_OIL_FILTER , NULL, 1u, POPUP11_MSG_ENGINE_OIL_FILTER , POPUP_MODE_MULTI, SND_NONE , SND_TYPE_MULTI,},
{/*62 POPUP11_FUEL_FILTER */ POPUP_TYPE_WARNING , 5u, 0u, POPUP_IGN_ON, POPUP11_FUEL_FILTER , NULL, 1u, POPUP11_MSG_FUEL_FILTER , POPUP_MODE_MULTI, SND_NONE , SND_TYPE_MULTI,},
{/*63 POPUP11_T_MISSION_OIL */ POPUP_TYPE_WARNING , 5u, 0u, POPUP_IGN_ON, POPUP11_T_MISSION_OIL , NULL, 1u, POPUP11_MSG_T_MISSION_OIL , POPUP_MODE_MULTI, SND_NONE , SND_TYPE_MULTI,},
{/*64 POPUP11_DIFF_OIL */ POPUP_TYPE_WARNING , 5u, 0u, POPUP_IGN_ON, POPUP11_DIFF_OIL , NULL, 1u, POPUP11_MSG_DIFF_OIL , POPUP_MODE_MULTI, SND_NONE , SND_TYPE_MULTI,},
{/*65 POPUP11_CLUTCH_OIL */ POPUP_TYPE_WARNING , 5u, 0u, POPUP_IGN_ON, POPUP11_CLUTCH_OIL , NULL, 1u, POPUP11_MSG_CLUTCH_OIL , POPUP_MODE_MULTI, SND_NONE , SND_TYPE_MULTI,},
{/*66 POPUP11_P_STEERING_FRUID */ POPUP_TYPE_WARNING , 5u, 0u, POPUP_IGN_ON, POPUP11_P_STEERING_FRUID , NULL, 1u, POPUP11_MSG_P_STEERING_FRUID , POPUP_MODE_MULTI, SND_NONE , SND_TYPE_MULTI,},
{/*67 POPUP11_TIRE_ROTATION */ POPUP_TYPE_WARNING , 5u, 0u, POPUP_IGN_ON, POPUP11_TIRE_ROTATION , NULL, 1u, POPUP11_MSG_TIRE_ROTATION , POPUP_MODE_MULTI, SND_NONE , SND_TYPE_MULTI,},
{/*57 POPUP10_RAPID_ACC */ POPUP_TYPE_WARNING1, 4u, 0u, POPUP_IGN_ON, POPUP10_RAPID_ACC , NULL, 1u, POPUP10_MSG_RAPID_ACC , POPUP_MODE_MULTI, SND_NONE , SND_TYPE_MULTI,},
{/*58 POPUP10_RAPID_SUB */ POPUP_TYPE_WARNING1, 4u, 0u, POPUP_IGN_ON, POPUP10_RAPID_SUB , NULL, 1u, POPUP10_MSG_RAPID_SUB , POPUP_MODE_MULTI, SND_NONE , SND_TYPE_MULTI,},
{/*59 POPUP10_REVAL_ENGINE */ POPUP_TYPE_WARNING1, 4u, 0u, POPUP_IGN_ON, POPUP10_REVAL_ENGINE , NULL, 1u, POPUP10_MSG_REVAL_ENGINE , POPUP_MODE_MULTI, SND_NONE , SND_TYPE_MULTI,},
{/*60 POPUP10_REVAL_SPEED */ POPUP_TYPE_WARNING1, 4u, 0u, POPUP_IGN_ON, POPUP10_REVAL_SPEED , NULL, 1u, POPUP10_MSG_REVAL_SPEED , POPUP_MODE_MULTI, SND_NONE , SND_TYPE_MULTI,},
{/*61 POPUP11_ENGINE_OIL_FILTER */ POPUP_TYPE_WARNING2, 5u, 0u, POPUP_IGN_ON, POPUP11_ENGINE_OIL_FILTER , NULL, 1u, POPUP11_MSG_ENGINE_OIL_FILTER , POPUP_MODE_MULTI, SND_NONE , SND_TYPE_MULTI,},
{/*62 POPUP11_FUEL_FILTER */ POPUP_TYPE_WARNING2, 5u, 0u, POPUP_IGN_ON, POPUP11_FUEL_FILTER , NULL, 1u, POPUP11_MSG_FUEL_FILTER , POPUP_MODE_MULTI, SND_NONE , SND_TYPE_MULTI,},
{/*63 POPUP11_T_MISSION_OIL */ POPUP_TYPE_WARNING2, 5u, 0u, POPUP_IGN_ON, POPUP11_T_MISSION_OIL , NULL, 1u, POPUP11_MSG_T_MISSION_OIL , POPUP_MODE_MULTI, SND_NONE , SND_TYPE_MULTI,},
{/*64 POPUP11_DIFF_OIL */ POPUP_TYPE_WARNING2, 5u, 0u, POPUP_IGN_ON, POPUP11_DIFF_OIL , NULL, 1u, POPUP11_MSG_DIFF_OIL , POPUP_MODE_MULTI, SND_NONE , SND_TYPE_MULTI,},
{/*65 POPUP11_CLUTCH_OIL */ POPUP_TYPE_WARNING2, 5u, 0u, POPUP_IGN_ON, POPUP11_CLUTCH_OIL , NULL, 1u, POPUP11_MSG_CLUTCH_OIL , POPUP_MODE_MULTI, SND_NONE , SND_TYPE_MULTI,},
{/*66 POPUP11_P_STEERING_FRUID */ POPUP_TYPE_WARNING2, 5u, 0u, POPUP_IGN_ON, POPUP11_P_STEERING_FRUID , NULL, 1u, POPUP11_MSG_P_STEERING_FRUID , POPUP_MODE_MULTI, SND_NONE , SND_TYPE_MULTI,},
{/*67 POPUP11_TIRE_ROTATION */ POPUP_TYPE_WARNING2, 5u, 0u, POPUP_IGN_ON, POPUP11_TIRE_ROTATION , NULL, 1u, POPUP11_MSG_TIRE_ROTATION , POPUP_MODE_MULTI, SND_NONE , SND_TYPE_MULTI,},
/*=============================================================================================================================================================================================================================================================================*/
};
\ No newline at end of file
source/Application/Alarm/Popup_List.h
View file @ ed652700
......@@ -102,6 +102,8 @@ enum PopupName
#define POPUP_TYPE_HINT 0x01 /*提示信息*/
#define POPUP_TYPE_WARNING 0x02 /*报警信息*/
#define POPUP_TYPE_EXCEPTION 0x04 /*特殊信息 */
#define POPUP_TYPE_WARNING1 0x08
#define POPUP_TYPE_WARNING2 0x10
/******************************************************************************
显示/声音模式
......
source/Application/Alarm/Popup_Scheduler.c
View file @ ed652700
......@@ -38,6 +38,8 @@ static CommMemBuf_t CommBuf[MAX_MEM_NUM];
static struct PopupList *FatalListHead = POPUPLIB_NULL;
static struct PopupList *HintListHead = POPUPLIB_NULL;
static struct PopupList *WarningListHead = POPUPLIB_NULL;
static struct PopupList *WarningListHead1 = POPUPLIB_NULL;
static struct PopupList *WarningListHead2 = POPUPLIB_NULL;
static struct PopupList *ExceptionListHead = POPUPLIB_NULL;
static PopupSchedulingStruct s_PopupScheduling;
......@@ -49,6 +51,8 @@ static void Popup_Update_Status ( uint16_t PopupID );
static void Popup_Fatal_Request ( uint16_t PopupID );
static void Popup_Hint_Request ( uint16_t PopupID );
static void Popup_Warning_Request ( uint16_t PopupID );
static void Popup_Warning_Request1 ( uint16_t PopupID );
static void Popup_Warning_Request2 ( uint16_t PopupID );
static void Popup_Exception_Request ( uint16_t PopupID );
static struct PopupList *Popup_Select ( uint16_t PopupID );
static void Popup_Delete_Request ( uint16_t PopupID );
......@@ -116,6 +120,8 @@ void Popup_Scheduler_OFF ( void )
HintListHead = PopupList_Destroy ( HintListHead );
/*3、删除全部报警类信息*/
WarningListHead = PopupList_Destroy ( WarningListHead );
WarningListHead1 = PopupList_Destroy ( WarningListHead1 );
WarningListHead2 = PopupList_Destroy ( WarningListHead2 );
/*4、删除全部特殊类信息*/
ExceptionListHead = PopupList_Destroy ( ExceptionListHead );
......@@ -309,6 +315,13 @@ void Popup_Request ( uint16_t PopupID )
Popup_Exception_Request ( PopupID );
break;
case POPUP_TYPE_WARNING1:
Popup_Warning_Request1 ( PopupID );
break;
case POPUP_TYPE_WARNING2:
Popup_Warning_Request2 ( PopupID );
break;
default:
break;
}
......@@ -828,11 +841,21 @@ static struct PopupList *Popup_Polling_Next ( struct PopupList *CurPopup )
{
if (PopupAttributeTable[NextPopup->PopupID].Priority == PopupAttributeTable[CurPopup->PopupID].Priority)
break;
else
else if (PopupAttributeTable[NextPopup->PopupID].Type == POPUP_TYPE_WARNING)
{
NextPopup = WarningListHead;
return NextPopup;
}
else if (PopupAttributeTable[NextPopup->PopupID].Type == POPUP_TYPE_WARNING1)
{
NextPopup = WarningListHead1;
return NextPopup;
}
else if (PopupAttributeTable[NextPopup->PopupID].Type == POPUP_TYPE_WARNING2)
{
NextPopup = WarningListHead2;
return NextPopup;
}
}
}
NextPopup = NextPopup->next;
......@@ -890,6 +913,50 @@ static struct PopupList *Popup_Polling_Next ( struct PopupList *CurPopup )
}
}
if ( ( WarningListHead1 != POPUPLIB_NULL ) && ( NextPopup == POPUPLIB_NULL ) )
{
#if POPUP_CUT_RECOVER
if ( s_PopupScheduling.PollPopupID < POPUP_MAX )
{
NextPopup = PopupList_Select ( WarningListHead1, &s_PopupScheduling.PollPopupID );
s_PopupScheduling.PollPopupID = POPUP_NONE;
}
#endif
if ( NextPopup == POPUPLIB_NULL )
{
NextPopup = WarningListHead1;
while ( NextPopup != POPUPLIB_NULL )
{
if ( ( NextPopup->Status == POPUP_STATUS_FIRST ) || ( NextPopup->Status == POPUP_STATUS_LOOP ) )
{
break;
}
NextPopup = NextPopup->next;
}
}
}
if ( ( WarningListHead2 != POPUPLIB_NULL ) && ( NextPopup == POPUPLIB_NULL ) )
{
#if POPUP_CUT_RECOVER
if ( s_PopupScheduling.PollPopupID < POPUP_MAX )
{
NextPopup = PopupList_Select ( WarningListHead2, &s_PopupScheduling.PollPopupID );
s_PopupScheduling.PollPopupID = POPUP_NONE;
}
#endif
if ( NextPopup == POPUPLIB_NULL )
{
NextPopup = WarningListHead2;
while ( NextPopup != POPUPLIB_NULL )
{
if ( ( NextPopup->Status == POPUP_STATUS_FIRST ) || ( NextPopup->Status == POPUP_STATUS_LOOP ) )
{
break;
}
NextPopup = NextPopup->next;
}
}
}
if ( ( ExceptionListHead != POPUPLIB_NULL ) && ( NextPopup == POPUPLIB_NULL ) )
{
NextPopup = HintListHead;
......@@ -1059,6 +1126,112 @@ static void Popup_Warning_Request ( uint16_t PopupID )
return;
}
static void Popup_Warning_Request1 ( uint16_t PopupID )
{
struct PopupList *p1 = POPUPLIB_NULL;
p1 = PopupList_Select ( WarningListHead1, &PopupID );
if ( p1 == POPUPLIB_NULL )
{
/*普通报警可以打断提示类信息，且未显示的提示类信息，不再进行显示，等同于特殊报警*/
#if POPUP_WARNING_CUT_HINT_MIN
p1 = HintListHead;
while ( p1 != POPUPLIB_NULL )
{
if ( p1->Status != POPUP_STATUS_OFF )
{
p1->Status = POPUP_STATUS_OFF;
}
p1 = p1->next;
}
#endif
p1 = PopupList_Malloc();
if ( p1 != POPUPLIB_NULL )
{
p1->PopupID = PopupID;
p1->Status = POPUP_STATUS_FIRST;
p1->next = POPUPLIB_NULL;
WarningListHead1 = PopupList_Insert ( WarningListHead1, p1 );
/*如果存在特殊报警，不更新新信息*/
if (( FatalListHead == POPUPLIB_NULL ) && (WarningListHead == POPUPLIB_NULL))
{
#if POPUP_WARNING_CUT_HINT_MIN
/*如果存在提示类信息，等待最小时间后，打断*/
if ( PopupAttributeTable[s_PopupScheduling.CurPopupID].Type == POPUP_TYPE_HINT )
{
s_PopupScheduling.NewPopupID = PopupID;
s_PopupScheduling.CutGrade = POPUP_CUT_WAIT_TIME_MIN;
}
else
{
Popup_Cal_CutGrade ( PopupID );
}
#else
Popup_Cal_CutGrade ( PopupID );
#endif
}
}
}
return;
}
static void Popup_Warning_Request2 ( uint16_t PopupID )
{
struct PopupList *p1 = POPUPLIB_NULL;
p1 = PopupList_Select ( WarningListHead2, &PopupID );
if ( p1 == POPUPLIB_NULL )
{
/*普通报警可以打断提示类信息，且未显示的提示类信息，不再进行显示，等同于特殊报警*/
#if POPUP_WARNING_CUT_HINT_MIN
p1 = HintListHead;
while ( p1 != POPUPLIB_NULL )
{
if ( p1->Status != POPUP_STATUS_OFF )
{
p1->Status = POPUP_STATUS_OFF;
}
p1 = p1->next;
}
#endif
p1 = PopupList_Malloc();
if ( p1 != POPUPLIB_NULL )
{
p1->PopupID = PopupID;
p1->Status = POPUP_STATUS_FIRST;
p1->next = POPUPLIB_NULL;
WarningListHead2 = PopupList_Insert ( WarningListHead2, p1 );
/*如果存在特殊报警，不更新新信息*/
if (( FatalListHead == POPUPLIB_NULL ) && (WarningListHead == POPUPLIB_NULL) && (WarningListHead1 == POPUPLIB_NULL))
{
#if POPUP_WARNING_CUT_HINT_MIN
/*如果存在提示类信息，等待最小时间后，打断*/
if ( PopupAttributeTable[s_PopupScheduling.CurPopupID].Type == POPUP_TYPE_HINT )
{
s_PopupScheduling.NewPopupID = PopupID;
s_PopupScheduling.CutGrade = POPUP_CUT_WAIT_TIME_MIN;
}
else
{
Popup_Cal_CutGrade ( PopupID );
}
#else
Popup_Cal_CutGrade ( PopupID );
#endif
}
}
}
return;
}
/**********************************************************************************************************
*@Function: Popup_Exception_Request
*@Description: 插入第四类信息，并确定其切换等级
......@@ -1126,6 +1299,14 @@ static struct PopupList *Popup_Select ( uint16_t PopupID )
{
head = ExceptionListHead;
}
else if ( PopupAttributeTable[PopupID].Type == POPUP_TYPE_WARNING1 )
{
head = WarningListHead1;
}
else if ( PopupAttributeTable[PopupID].Type == POPUP_TYPE_WARNING2 )
{
head = WarningListHead2;
}
else
{
......@@ -1169,6 +1350,14 @@ static void Popup_Delete_Request ( uint16_t PopupID )
{
ExceptionListHead = PopupList_Delete ( ExceptionListHead, PopupID );
}
else if ( PopupAttributeTable[PopupID].Type == POPUP_TYPE_WARNING1 )
{
WarningListHead1 = PopupList_Delete ( WarningListHead1, PopupID );
}
else if ( PopupAttributeTable[PopupID].Type == POPUP_TYPE_WARNING2 )
{
WarningListHead2 = PopupList_Delete ( WarningListHead2, PopupID );
}
else
{
......
source/Application/Alarm/Popups.c
View file @ ed652700
......@@ -22,7 +22,7 @@
#include "FuelConfig.h"
#include "Service_TPMS.h"
#include "Telltales.h"
#include "DisplaySch_user.h"
#include "kwp2000_service.h"
#include "CAN_FUNC.h"
......@@ -673,7 +673,7 @@ void Popups_Polling(void)
}
/*----第六组---------------------------------------------------------------------*/
if (V_Speed < 66u)
if (V_Speed <= DISPSPEEDNULLMAX)
{
/*43.--1--遥控车辆高度调整中(无车速) B30 28V*/
variable_1 = Line_In_Get_Status(LINE_IN_AIR_SUS);
......@@ -934,53 +934,62 @@ void Popups_Polling(void)
}
/*----第十组---------------------------------------------------------------------*/
/*57.--1--省油耗建议-急加速*/
if ((AccSubSpeed.AccSpeed_Flag == 1) && (User_App.User_JADD != 0xFF))
if (V_Speed > DISPSPEEDNULLMAX)
{
Popup_Request(POPUP10_RAPID_ACC);
}
else
{
Popup_Delete(POPUP10_RAPID_ACC);
}
/*57.--1--省油耗建议-急加速*/
if ((AccSubSpeed.AccSpeed_Flag == 1) && (User_App.User_JADD != 0xFF))
{
Popup_Request(POPUP10_RAPID_ACC);
}
else
{
Popup_Delete(POPUP10_RAPID_ACC);
}
/*58.--2--省油耗建议-急减速*/
if ((AccSubSpeed.SubSpeed_Flag == 1) && (User_App.User_JSUB != 0xFF))
{
Popup_Request(POPUP10_RAPID_SUB);
}
else
{
Popup_Delete(POPUP10_RAPID_SUB);
}
/*58.--2--省油耗建议-急减速*/
if ((AccSubSpeed.SubSpeed_Flag == 1) && (User_App.User_JSUB != 0xFF))
{
Popup_Request(POPUP10_RAPID_SUB);
}
else
{
Popup_Delete(POPUP10_RAPID_SUB);
}
/*59.--3--省油耗建议-请降低发动机转速*/
variable_1 = Common_Get_OverEpeed_Status();
/*59.--3--省油耗建议-请降低发动机转速*/
variable_1 = Common_Get_OverEpeed_Status();
if ((variable_1 == 1) && (User_App.User_Speed != 0xFF))
{
Popup_Request(POPUP10_REVAL_ENGINE);
}
else
{
Popup_Delete(POPUP10_REVAL_ENGINE);
}
if ((variable_1 == 1) && (User_App.User_Speed != 0xFF))
{
Popup_Request(POPUP10_REVAL_ENGINE);
}
else
{
Popup_Delete(POPUP10_REVAL_ENGINE);
}
/*60.--4--省油耗建议-请降低速度*/
variable_1 = Common_Get_OverSpeedLine_Status();
/*60.--4--省油耗建议-请降低速度*/
variable_1 = Common_Get_OverSpeedLine_Status();
if (
((variable_1 == 1) && (K_Line_Set.K_Line_LID44 != 0xFF)) ||
((AccSubSpeed.GslSpeed_Flag == 0x01u) && (User_App.User_Gsl == 0x01u)) ||
((AccSubSpeed.YblSpeed_Flag == 0x01u) && (User_App.User_Ybl == 0x01u)))
{
Popup_Request(POPUP10_REVAL_SPEED);
if (
((variable_1 == 1) && (K_Line_Set.K_Line_LID44 != 0xFF)) ||
((AccSubSpeed.GslSpeed_Flag == 0x01u) && (User_App.User_Gsl == 0x01u)) ||
((AccSubSpeed.YblSpeed_Flag == 0x01u) && (User_App.User_Ybl == 0x01u)))
{
Popup_Request(POPUP10_REVAL_SPEED);
}
else
{
Popup_Delete(POPUP10_REVAL_SPEED);
}
}
else
{
Popup_Delete(POPUP10_REVAL_SPEED);
Popup_Clear(POPUP10_RAPID_ACC );
Popup_Clear(POPUP10_RAPID_SUB );
Popup_Clear(POPUP10_REVAL_ENGINE );
Popup_Clear(POPUP10_REVAL_SPEED );
}
/*----第十一组---------------------------------------------------------------------*/
/*61.--1--发动机机油＆滤清器*/
if (((State_Flag.User_FDJYLQQ_FLAG == 1) || (State_Flag.User_FDJYLQQ_FLAG == 2)) && (Common_Get_FDJYLQQ_Sta() == 0x01u))
......@@ -1485,7 +1494,7 @@ void Popup_Alone_Sound_Server(void)
/*19 安全带*/
V_Speed = Common_Get_Disp_V_Speed(); /*车速*/
if ((CD4051_COM2_X3_IN == 0u) && (V_Speed >= 67))
if ((CD4051_COM2_X3_IN == 0u) && (V_Speed > DISPSPEEDNULLMAX))
{
Sound_Request(SND_SEATBELT_SPEED, 1u);
}
......@@ -1505,31 +1514,6 @@ void Popup_Alone_Sound_Server(void)
{
Sound_Delete(SND_Fuel_Saving);
}
/*音源测试程序*/
//if (Sound_test & 0x001) Sound_Request ( SND_Key_Notremoved, 1 ); else Sound_Delete( SND_Key_Notremoved );
//if (Sound_test & 0x002) Sound_Request ( SND_Braking, 1 ); else Sound_Delete( SND_Braking );
//if (Sound_test & 0x004) Sound_Request ( SND_Air_Brake, 1 ); else Sound_Delete( SND_Air_Brake );
//if (Sound_test & 0x008) Sound_Request ( SND_BRAKE_LOCK, 1 ); else Sound_Delete( SND_BRAKE_LOCK );
//if (Sound_test & 0x010) Sound_Request ( SND_Parking_Brake, 1 ); else Sound_Delete( SND_Parking_Brake );
//if (Sound_test & 0x020) Sound_Request ( SND_Car_Dump_SPEED, 1 ); else Sound_Delete( SND_Car_Dump_SPEED );
//if (Sound_test & 0x040) Sound_Request ( SND_Temp_High, 1 ); else Sound_Delete( SND_Temp_High );
//if (Sound_test & 0x080) Sound_Request ( SND_Coolant_Low, 1 ); else Sound_Delete( SND_Coolant_Low );
//if (Sound_test & 0x100) Sound_Request ( SND_Oil_pressure_Low, 1 ); else Sound_Delete( SND_Oil_pressure_Low );
//if (Sound_test & 0x200) Sound_Request ( SND_ACC_AIR, 1 ); else Sound_Delete( SND_ACC_AIR );
//if (Sound_test & 0x400) Sound_Request ( SND_BackUP_SPEED, 1 ); else Sound_Delete( SND_BackUP_SPEED );
//if (Sound_test & 0x800) Sound_Request ( SND_DS_SPEED, 1 ); else Sound_Delete( SND_DS_SPEED );
//if (CD4051_COM7_X0_IN == 0u) Sound_Request ( SND_Key_Notremoved, 1 ); else Sound_Delete( SND_Key_Notremoved );/*B15 = 0*/
//if (CD4051_COM7_X1_IN == 1u) Sound_Request ( SND_Braking, 1 ); else Sound_Delete( SND_Braking );/*B16 = 1*/
//if (CD4051_COM7_X2_IN == 1u) Sound_Request ( SND_Air_Brake, 1 ); else Sound_Delete( SND_Air_Brake );/*B17 = 1*/
//if (CD4051_COM7_X3_IN == 1u) Sound_Request ( SND_BRAKE_LOCK, 1 ); else Sound_Delete( SND_BRAKE_LOCK );/*B14 = 1*/
//if (CD4051_COM7_X4_IN == 1u) Sound_Request ( SND_Parking_Brake, 1 ); else Sound_Delete( SND_Parking_Brake );/*B10 = 1*/
//if (CD4051_COM7_X5_IN == 1u) Sound_Request ( SND_Car_Dump_SPEED, 1 ); else Sound_Delete( SND_Car_Dump_SPEED );/*B13 = 1*/
//if (CD4051_COM7_X6_IN == 1u) Sound_Request ( SND_Temp_High, 1 ); else Sound_Delete( SND_Temp_High );/*B11 = 1*/
//if (CD4051_COM7_X7_IN == 1u) Sound_Request ( SND_Coolant_Low, 1 ); else Sound_Delete( SND_Coolant_Low );/*B12 = 1*/
//if (CD4051_COM6_X5_IN == 1u) Sound_Request ( SND_Oil_pressure_Low, 1 ); else Sound_Delete( SND_Oil_pressure_Low );/*B04 = 1*/
//if (CD4051_COM6_X6_IN == 1u) Sound_Request ( SND_ACC_AIR, 1 ); else Sound_Delete( SND_ACC_AIR );/*B02 = 1*/
//if (CD4051_COM6_X7_IN == 0u) Sound_Request ( SND_BackUP_SPEED, 1 ); else Sound_Delete( SND_BackUP_SPEED );/*B03 = 0*/
}
else /*IG-OFF*/
{
......
source/Application/Graphic/GUI/GUI.c
View file @ ed652700
......@@ -1877,6 +1877,7 @@ void GUI_DPD_Display_Display(uint8_t Mode)
if ((value > 1000u) && (CanFlag != 1))
{
/*----禅道3366----*/
if (DPD_Display_Time < 200)
{
DPD_Display_Time ++;
......@@ -6873,7 +6874,7 @@ void GUI_General_Popup_Display(uint16_t PopupMsg)
V_Speed = Common_Get_Disp_V_Speed();
if (V_Speed > 66u) /*有车速*/
if (V_Speed > DISPSPEEDNULLMAX) /*有车速*/
{
if ((PopupMsg == POPUP1_MSG_BRAKE_BLACK) || (PopupMsg == POPUP1_MSG_BRAKE_BRAKE))
{
......
source/Application/Graphic/GUI/GUI.h
View file @ ed652700
......@@ -17,7 +17,7 @@
#define FState_COilTimeOutNum 60u /*3S*/
#define SystemSupplierECUHardwareVersionNumberApp ((uint16_t)(10202)) /*硬件版本号 HV:01.02.02*/
#define SystemSupplierECUSoftwareInformationApp ((uint16_t)(10106)) /*软件版本号 SV:01.01.05*/
#define SystemSupplierECUSoftwareInformationApp ((uint16_t)(10107)) /*软件版本号 SV:01.01.05*/
#define systemSupplierECUFlashInformationApp ((uint16_t)(14)) /*FLASH版本号 FV:00.14*/
typedef struct
......@@ -247,10 +247,10 @@ static const GUIGeneralPopupStruct GUIGeneralPopupTable[] =
{CN_Alarm_drive_41_image, CN_Alarm_drive_41_wenzi, SpriteSize, CN_Alarm_stop_43_wenzi1, CN_Alarm_stop_43_wenzi2}, /*54. DPD自动再生-再生将自动完成，不需要操作开关*/
{CN_Alarm_drive_42_image, CN_Alarm_drive_42_wenzi1, SpriteSize, CN_Alarm_stop_44_wenzi1_1, CN_Alarm_stop_44_wenzi1_2}, /*55.第九组 气压过低-请冲入空气*/
{CN_Alarm_drive_42_image, CN_Alarm_drive_42_wenzi2_2, CN_Alarm_drive_42_wenzi2_1, CN_Alarm_stop_44_wenzi2_1, CN_Alarm_stop_44_wenzi2_2}, /*56. EBS故障（红）-请与五十铃公司联系*/
{CN_Alarm_drive_43_image, CN_Alarm_drive_43_wenzi1, SpriteSize, SpriteSize, SpriteSize}, /*57.第十组 省油耗建议-急加速*/
{CN_Alarm_drive_43_image, CN_Alarm_drive_43_wenzi2, SpriteSize, SpriteSize, SpriteSize}, /*58. 省油耗建议-急减速*/
{CN_Alarm_drive_43_image, CN_Alarm_drive_43_wenzi3, SpriteSize, SpriteSize, SpriteSize}, /*59. 省油耗建议-请降低发动机转速*/
{CN_Alarm_drive_43_image, CN_Alarm_drive_43_wenzi4, SpriteSize, SpriteSize, SpriteSize}, /*60. 省油耗建议-请降低速度*/
{SpriteSize, CN_Alarm_drive_43_image, CN_Alarm_drive_43_wenzi1, SpriteSize, SpriteSize}, /*57.第十组 省油耗建议-急加速*/
{SpriteSize, CN_Alarm_drive_43_image, CN_Alarm_drive_43_wenzi2, SpriteSize, SpriteSize}, /*58. 省油耗建议-急减速*/
{SpriteSize, CN_Alarm_drive_43_image, CN_Alarm_drive_43_wenzi3, SpriteSize, SpriteSize}, /*59. 省油耗建议-请降低发动机转速*/
{SpriteSize, CN_Alarm_drive_43_image, CN_Alarm_drive_43_wenzi4, SpriteSize, SpriteSize}, /*60. 省油耗建议-请降低速度*/
{CN_Alarm_drive_44_image, CN_Alarm_drive_44_wenzi1_1, CN_Alarm_drive_44_wenzi1, CN_Alarm_drive_44_wenzi1_1, CN_Alarm_drive_44_wenzi1}, /*61.第11组 发动机机油＆滤清器*/
{CN_Alarm_drive_44_image, CN_Alarm_drive_44_wenzi1_2, CN_Alarm_drive_44_wenzi1, CN_Alarm_drive_44_wenzi1_2, CN_Alarm_drive_44_wenzi1}, /*62. 燃油滤清器*/
{CN_Alarm_drive_44_image, CN_Alarm_drive_44_wenzi1_3, CN_Alarm_drive_44_wenzi1, CN_Alarm_drive_44_wenzi1_3, CN_Alarm_drive_44_wenzi1}, /*63. 变速箱油*/
......
source/Application/Graphic/UE/DisplaySch_user.c
View file @ ed652700
......@@ -136,7 +136,7 @@ void DisplayServices(void)
}
else
{
if ((State_Flag.Menu_Key_Static == 1u) && (Get_Menu_Off_Time < 150000))
if ((State_Flag.Menu_Key_Static == 1u) && (Get_Menu_Off_Time < 7500))
{
UE_EN[Display_Menu] = UE_Enable;
UE_EN[Display_Nothing] = UE_Disable;
......
source/Application/K_BUS/kwp2000_service.c
View file @ ed652700
......@@ -48,6 +48,7 @@ unsigned long SeedKey = 0;
unsigned long EOLSeedRandomNumber = 0x727u;
unsigned char DTCstatusCHGFFK_Line = 0u;
#pragma ghs section bss=default
/*
*********************************************************************
* function
......@@ -523,6 +524,7 @@ unsigned char kwp_writeDataByLocalIdentifier(unsigned char *TxData, unsigned cha
break;
case 0x48: /* 长时间怠速 */
K_Line_Set.K_Line_LID48 = RequestData[2];
User_App.User_IDLING = K_Line_Set.K_Line_LID48;
(*TxData++) = KWP2000_WRITEDATABYLOCALIDENTIFIER_REQUEST + KWP2000_POSITIVE_RESPONSE_OFFSET;
(*TxData++) = 0x48;
Tx_Len = 2;
......@@ -530,13 +532,15 @@ unsigned char kwp_writeDataByLocalIdentifier(unsigned char *TxData, unsigned cha
break;
case 0x49: /* 辅助驻车 */
K_Line_Set.K_Line_LID49 = RequestData[2];
(*TxData++) = KWP2000_WRITEDATABYLOCALIDENTIFIER_REQUEST + KWP2000_POSITIVE_RESPONSE_OFFSET;
User_App.User_Parking = K_Line_Set.K_Line_LID49;
(*TxData++) = KWP2000_WRITEDATABYLOCALIDENTIFIER_REQUEST + KWP2000_POSITIVE_RESPONSE_OFFSET;
(*TxData++) = 0x49;
Tx_Len = 2;
DTCstatusCHGFFK_Line = 1;
break;
case 0x4A: /* 变速箱油 */
K_Line_Set.K_Line_LID4A = RequestData[2];
User_App.User_BSXY = (uint32_t)K_Line_Set.K_Line_LID4A * 1000u ;
(*TxData++) = KWP2000_WRITEDATABYLOCALIDENTIFIER_REQUEST + KWP2000_POSITIVE_RESPONSE_OFFSET;
(*TxData++) = 0x4A;
Tx_Len = 2;
......@@ -544,6 +548,7 @@ unsigned char kwp_writeDataByLocalIdentifier(unsigned char *TxData, unsigned cha
break;
case 0x4B: /* 差速器油 */
K_Line_Set.K_Line_LID4B = RequestData[2];
User_App.User_CSQY = (uint32_t)K_Line_Set.K_Line_LID4B * 1000u ;
(*TxData++) = KWP2000_WRITEDATABYLOCALIDENTIFIER_REQUEST + KWP2000_POSITIVE_RESPONSE_OFFSET;
(*TxData++) = 0x4B;
Tx_Len = 2;
......@@ -558,6 +563,7 @@ unsigned char kwp_writeDataByLocalIdentifier(unsigned char *TxData, unsigned cha
break;
case 0x4D: /* 动力转向油 */
K_Line_Set.K_Line_LID4D = RequestData[2];
User_App.User_DLZXY = (uint32_t)K_Line_Set.K_Line_LID4D * 1000u ;
(*TxData++) = KWP2000_WRITEDATABYLOCALIDENTIFIER_REQUEST + KWP2000_POSITIVE_RESPONSE_OFFSET;
(*TxData++) = 0x4D;
Tx_Len = 2;
......@@ -565,6 +571,7 @@ unsigned char kwp_writeDataByLocalIdentifier(unsigned char *TxData, unsigned cha
break;
case 0x4E: /* 轮胎 */
K_Line_Set.K_Line_LID4E = RequestData[2];
User_App.User_LT = (uint32_t)K_Line_Set.K_Line_LID4E * 1000u ;
(*TxData++) = KWP2000_WRITEDATABYLOCALIDENTIFIER_REQUEST + KWP2000_POSITIVE_RESPONSE_OFFSET;
(*TxData++) = 0x4E;
Tx_Len = 2;
......@@ -572,6 +579,7 @@ unsigned char kwp_writeDataByLocalIdentifier(unsigned char *TxData, unsigned cha
break;
case 0x4F: /* 机油&滤清器 */
K_Line_Set.K_Line_LID4F = RequestData[2];
User_App.User_FDJYLQQ = (uint32_t)K_Line_Set.K_Line_LID4F * 1000u ;
(*TxData++) = KWP2000_WRITEDATABYLOCALIDENTIFIER_REQUEST + KWP2000_POSITIVE_RESPONSE_OFFSET;
(*TxData++) = 0x4F;
Tx_Len = 2;
......@@ -1455,48 +1463,48 @@ void K_LINE_EOL_InitVal(void)
{
K_Line_Set.Flag = 0x7AA7A55Au;
K_Line_Set.K_Line_LID20 = 0x00u; /* 00 应对ECE R13 //0：非应对、1：应对 */
K_Line_Set.K_Line_LID21 = 0x00u; /* 00 EBS/ABS //0：无、1：EBS、2：ABS(CAN应对) 3：ABS (CAN非应对) */
K_Line_Set.K_Line_LID22 = 0x00u; /* 00 EVSC //0：无、1：有 */
K_Line_Set.K_Line_LID23 = 0x00u; /* 00 驻车锁定 //0：无、1：有 */
K_Line_Set.K_Line_LID24 = 0x00u; /* 00 HSA //0：无、1：有 */
K_Line_Set.K_Line_LID25 = 0x00u; /* 00 AEBS //0：无、1：有 */
K_Line_Set.K_Line_LID26 = 0x00u; /* 00 ACC //0：无、1：有 */
K_Line_Set.K_Line_LID27 = 0x00u; /* 00 LDWS //0：无、1：有 */
K_Line_Set.K_Line_LID28 = 0x00u; /* 01 车辆间报警 //0：无、1：有 */
K_Line_Set.K_Line_LID20 = 0x01u; /* 00 应对ECE R13 //0：非应对、1：应对 */
K_Line_Set.K_Line_LID21 = 0x01u; /* 00 EBS/ABS //0：无、1：EBS、2：ABS(CAN应对) 3：ABS (CAN非应对) */
K_Line_Set.K_Line_LID22 = 0x01u; /* 00 EVSC //0：无、1：有 */
K_Line_Set.K_Line_LID23 = 0x01u; /* 00 驻车锁定 //0：无、1：有 */
K_Line_Set.K_Line_LID24 = 0x01u; /* 00 HSA //0：无、1：有 */
K_Line_Set.K_Line_LID25 = 0x01u; /* 00 AEBS //0：无、1：有 */
K_Line_Set.K_Line_LID26 = 0x01u; /* 00 ACC //0：无、1：有 */
K_Line_Set.K_Line_LID27 = 0x01u; /* 00 LDWS //0：无、1：有 */
K_Line_Set.K_Line_LID28 = 0x01u; /* 01 车辆间报警 //0：无、1：有 */
K_Line_Set.K_Line_LID29 = 0x01u; /* 01 有无巡航 //0：无、1：有 /*初值1*/
K_Line_Set.K_Line_LID2A = 0x00u; /* 00 气悬 //0：Reef、1：Rear air、2：Full air */
K_Line_Set.K_Line_LID2A = 0x01u; /* 00 气悬 //0：Reef、1：Rear air、2：Full air */
K_Line_Set.K_Line_LID2B = 0x00u; /* 00 ISS //0：无、1： eco stop、 2：Idle Stop */
K_Line_Set.K_Line_LID2C = 0x00u; /* 00 装货台工作警报蜂鸣 //0：无、1：有 */
K_Line_Set.K_Line_LID2D = 0x00u; /* 00 ROWS //0：无、1：ROWS有、2LOCAL警报有 */
K_Line_Set.K_Line_LID2E = 0x00u; /* 00 行车记录仪 //0：模拟记录仪、１：数字记录仪或行车记录仪 */
K_Line_Set.K_Line_LID2C = 0x01u; /* 00 装货台工作警报蜂鸣 //0：无、1：有 */
K_Line_Set.K_Line_LID2D = 0x01u; /* 00 ROWS //0：无、1：ROWS有、2LOCAL警报有 */
K_Line_Set.K_Line_LID2E = 0x01u; /* 00 行车记录仪 //0：模拟记录仪、１：数字记录仪或行车记录仪 */
K_Line_Set.K_Line_LID2F = 0x00u; /* 00 车型 //0：单车、1：拖车、2：全拖车 */
K_Line_Set.K_Line_LID30 = 0x00u; /* 00 缓速器 //0：无、1：有(C&E)、2：有(F) */
K_Line_Set.K_Line_LID30 = 0x01u; /* 00 缓速器 //0：无、1：有(C&E)、2：有(F) */
K_Line_Set.K_Line_LID31 = 0x01u; /* -- 定速巡航 //0：无、1：有 */
K_Line_Set.K_Line_LID32 = 0x00u; /* 00 装货台种类 //0：一般、1：侧翼、2：倾倒 */
K_Line_Set.K_Line_LID33 = 0x00u; /* 01 SCR?DPD //0：SCR无/DPD有、1：SCR有/DPD有、2：SCR无/DPD无、3：SCR有/DPD无 /*初值1*/
K_Line_Set.K_Line_LID33 = 0x01u; /* 01 SCR?DPD //0：SCR无/DPD有、1：SCR有/DPD有、2：SCR无/DPD无、3：SCR有/DPD无 /*初值1*/
K_Line_Set.K_Line_LID34 = 0x00u; /* 00 驻车种类 //0：FULL AIR、1：AOH /*初值1*/
K_Line_Set.K_Line_LID35 = 0x00u; /* -- 气压计 //0：2针式、1：1针式 */
K_Line_Set.K_Line_LID36 = 0x00u; /* -- 低压警报压 //0：一般输出（539kPa）、1：ADR（588kPa） */
K_Line_Set.K_Line_LID37 = 0x01u; /* -- 超限警报 //0：无、1：有 */
K_Line_Set.K_Line_LID38 = 0x01u; /* -- 速度警报 //0：无、1：有 */
K_Line_Set.K_Line_LID39 = 0x00u; /* 00 可变SLD //0：无、1：1车速、2：2车速 /*初值1*/
K_Line_Set.K_Line_LID39 = 0x01u; /* 00 可变SLD //0：无、1：1车速、2：2车速 /*初值1*/
K_Line_Set.K_Line_LID3A = 0x00u; /* -- OEM //0：ISZ、1：UDT */
K_Line_Set.K_Line_LID3B = 0x00u; /* -- 预留 */
K_Line_Set.K_Line_LID3C = 0x00u; /* -- 预留 */
K_Line_Set.K_Line_LID3D = 0x00u; /* -- 预留 */
K_Line_Set.K_Line_LID3E = 0x00u; /* 01 胎压匹配功能 //0：胎压功能未匹配 1：匹配 */
K_Line_Set.K_Line_LID3E = 0x01u; /* 01 胎压匹配功能 //0：胎压功能未匹配 1：匹配 */
K_Line_Set.K_Line_LID3F = 0x00u; /* -- 预留 */
K_Line_Set.K_Line_LID40 = 0x00u; /* 00 发动机种类 */
K_Line_Set.K_Line_LID41 = 0x01u; /* 50 变速器种类＆控制 /*初值50*/
K_Line_Set.K_Line_LID42 = 0x00u; /* 00 驻车管道 /*初值 0*/
K_Line_Set.K_Line_LID43 = 0x82u; /* 82 车型 /*初值44*/
K_Line_Set.K_Line_LID44 = 0xFFu; /* FF 速度警报 /*初值FF*/
K_Line_Set.K_Line_LID45 = 0xFFu; /* FF 发动机转速 /*初值FF*/
K_Line_Set.K_Line_LID46 = 0xFFu; /* FF 急加速 /*初FF*/
K_Line_Set.K_Line_LID47 = 0xFFu; /* FF 急减速 /*初值FF*/
K_Line_Set.K_Line_LID48 = 0xFFu; /* FF 长时间怠速 /*初值FF*/
K_Line_Set.K_Line_LID49 = 0xFFu; /* FF 辅助驻车 /*初值FF*/
K_Line_Set.K_Line_LID45 = 0x01u; /* FF 发动机转速 /*初值FF*/
K_Line_Set.K_Line_LID46 = 0x01u; /* FF 急加速 /*初FF*/
K_Line_Set.K_Line_LID47 = 0x01u; /* FF 急减速 /*初值FF*/
K_Line_Set.K_Line_LID48 = 0x01u; /* FF 长时间怠速 /*初值FF*/
K_Line_Set.K_Line_LID49 = 0x01u; /* FF 辅助驻车 /*初值FF*/
K_Line_Set.K_Line_LID4A = 0x32u; /* 37 变速箱油 55000 */
K_Line_Set.K_Line_LID4B = 0x32u; /* 37 差速器油 55000 */
K_Line_Set.K_Line_LID4C = 0x32u; /* 37 离合器油 55000 */
......@@ -1530,4 +1538,4 @@ void K_LINE_EOL_InitVal(void)
K_Line_Set.TesterECUCAN = 0x00u; /* 20 */
K_Line_Set.User_Light1 = 10u; /*背光亮度等级*/
K_Line_Set.User_Light2 = 10u; /*背光亮度等级*/
}
\ No newline at end of file
}
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