Commit 6f87abdf authored by 崔立宝's avatar 崔立宝

变更项4.屏蔽禁止再生指示灯及所有功能;屏蔽所有PEPS关联功能

parent ae3a3556
...@@ -88,7 +88,7 @@ void BL_Management_Service(void) ...@@ -88,7 +88,7 @@ void BL_Management_Service(void)
BlTurnOffDelay--; BlTurnOffDelay--;
else else
{ {
if ((DriveDoorSts == 1) || (PsngrDoorSts == 1) || (PositionLightSts == 1) || (HazardLightSts == 1) || ((PepslcuAlarm > 0) && (PepslcuAlarm < 13)) || (PepslcuAlarm == 14) || ((RHTurnSignalSts == 1) && (LHTurnSignalSts == 1))) //20200501 fhl if ((DriveDoorSts == 1) || (PsngrDoorSts == 1) || (PositionLightSts == 1) || (HazardLightSts == 1) /*|| ((PepslcuAlarm > 0) && (PepslcuAlarm < 13)) || (PepslcuAlarm == 14)*/ || ((RHTurnSignalSts == 1) && (LHTurnSignalSts == 1))) //20200501 fhl
{ {
if (PositionLightSts == 1) if (PositionLightSts == 1)
{ {
...@@ -115,11 +115,11 @@ void BL_Management_Service(void) ...@@ -115,11 +115,11 @@ void BL_Management_Service(void)
{ {
BackLight_TFT_Set((BcakLightPOS + 1) * 25); BackLight_TFT_Set((BcakLightPOS + 1) * 25);
} }
else if (((PepslcuAlarm > 0) && (PepslcuAlarm < 13)) || (PepslcuAlarm == 14)) /*else if (((PepslcuAlarm > 0) && (PepslcuAlarm < 13)) || (PepslcuAlarm == 14))
{ {
BackLight_TFT_Set((BcakLightPOS + 1) * 25); BackLight_TFT_Set((BcakLightPOS + 1) * 25);
PWM_Channel_Set_Duty_Cycle(5, 0); //2020 01 06 WH 修改off下报警大C问题 PWM_Channel_Set_Duty_Cycle(5, 0); //2020 01 06 WH 修改off下报警大C问题
} }*/
else else
BackLight_TFT_Close(); //屏 BackLight_TFT_Close(); //屏
} }
......
...@@ -162,14 +162,14 @@ void Drive_Info_Display_Update_Service(void) ...@@ -162,14 +162,14 @@ void Drive_Info_Display_Update_Service(void)
else if (SYS_IGN_OFF_DISP_MODE) else if (SYS_IGN_OFF_DISP_MODE)
{ {
TFT_LCD_Clear_Multi_Layer(0, YVC_LYR_NUM_CPU-3); TFT_LCD_Clear_Multi_Layer(0, YVC_LYR_NUM_CPU-3);
if (PepslcuAlarm == 11) /*if (PepslcuAlarm == 11)
{ {
} }
else if (((PepslcuAlarm > 0) && (PepslcuAlarm < 11)) || (PepslcuAlarm == 12) || (PepslcuAlarm == 14)) else if (((PepslcuAlarm > 0) && (PepslcuAlarm < 11)) || (PepslcuAlarm == 12) || (PepslcuAlarm == 14))
{ {
TFT_LCD_Clear_Layer(LAYER_MENU14); TFT_LCD_Clear_Layer(LAYER_MENU14);
} }
else else*/
TFT_LCD_Clear_Multi_Layer(YVC_LYR_NUM_CPU - 2, YVC_LYR_NUM_CPU - 1); TFT_LCD_Clear_Multi_Layer(YVC_LYR_NUM_CPU - 2, YVC_LYR_NUM_CPU - 1);
//�ſ������� KL30 ��������15 //�ſ������� KL30 ��������15
......
...@@ -333,6 +333,7 @@ void Popups_Polling(void) ...@@ -333,6 +333,7 @@ void Popups_Polling(void)
if (SYS_IGN_OFF_DISP_MODE) if (SYS_IGN_OFF_DISP_MODE)
{ {
#if 0
if (PepslcuAlarm == 1) // PEPS 系统异常 if (PepslcuAlarm == 1) // PEPS 系统异常
{ {
Popup_Request(POPUP_PEPS_Fault); Popup_Request(POPUP_PEPS_Fault);
...@@ -434,6 +435,7 @@ void Popups_Polling(void) ...@@ -434,6 +435,7 @@ void Popups_Polling(void)
{ {
Popup_Delete(POPUP_Running_Err); // 运行状态错误,请下电后重新启动 Popup_Delete(POPUP_Running_Err); // 运行状态错误,请下电后重新启动
} }
#endif
} }
else else
{ {
......
...@@ -237,12 +237,14 @@ void Telltales_Management(void) ...@@ -237,12 +237,14 @@ void Telltales_Management(void)
Sound_Delete(SND_TOCK); Sound_Delete(SND_TOCK);
} }
*/ */
#if 0
if (PepslcuAlarm == 13) // 锟斤拷锟斤拷时钥锟斤拷锟节筹拷锟斤拷 if (PepslcuAlarm == 13) // 锟斤拷锟斤拷时钥锟斤拷锟节筹拷锟斤拷
{ {
Sound_Request(SND_LockWithKeyInCar, 1); Sound_Request(SND_LockWithKeyInCar, 1);
} }
else else
Sound_Delete(SND_LockWithKeyInCar); Sound_Delete(SND_LockWithKeyInCar);
#endif
//5 远锟斤拷指示锟斤拷 15 30 //5 远锟斤拷指示锟斤拷 15 30
if (HighBeamSts == 1) if (HighBeamSts == 1)
BD83790A |= BD8379_D8; BD83790A |= BD8379_D8;
...@@ -1031,7 +1033,7 @@ void Telltales_Management(void) ...@@ -1031,7 +1033,7 @@ void Telltales_Management(void)
} }
} }
//-------------------------------------------------------------------// //-------------------------------------------------------------------//
else if ((NVM_CONFIG_YUN > 0) || (NVM_CONFIG_KANG > 0)) /*else if ((NVM_CONFIG_YUN > 0) || (NVM_CONFIG_KANG > 0))
{ {
if (DPF_Forbidden_Lamp_YUN == 1) if (DPF_Forbidden_Lamp_YUN == 1)
{ {
...@@ -1071,7 +1073,7 @@ void Telltales_Management(void) ...@@ -1071,7 +1073,7 @@ void Telltales_Management(void)
DPF_Forbidden_Count = 0; DPF_Forbidden_Count = 0;
BD83790B &= ~BD8379_D5; BD83790B &= ~BD8379_D5;
} }
} }*/
/* /*
else if (NVM_CONFIG_KANG > 0) //锟斤拷锟斤拷锟斤拷删锟斤拷 else if (NVM_CONFIG_KANG > 0) //锟斤拷锟斤拷锟斤拷删锟斤拷
{ {
...@@ -2187,13 +2189,14 @@ void Telltales_Management(void) ...@@ -2187,13 +2189,14 @@ void Telltales_Management(void)
{ {
ASTL_Flag = 0; ASTL_Flag = 0;
TelltaleLCDFlag.Telltale = 0x00000000; TelltaleLCDFlag.Telltale = 0x00000000;
#if 0
if (PepslcuAlarm == 13) // 锟斤拷锟斤拷时钥锟斤拷锟节筹拷锟斤拷 if (PepslcuAlarm == 13) // 锟斤拷锟斤拷时钥锟斤拷锟节筹拷锟斤拷
{ {
Sound_Request(SND_LockWithKeyInCar, 1); Sound_Request(SND_LockWithKeyInCar, 1);
} }
else else
Sound_Delete(SND_LockWithKeyInCar); Sound_Delete(SND_LockWithKeyInCar);
#endif
Sound_Delete(SND_BreakPressure); Sound_Delete(SND_BreakPressure);
//5 远锟斤拷指示锟斤拷 15 30 //5 远锟斤拷指示锟斤拷 15 30
if (HighBeamSts == 1) if (HighBeamSts == 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