Commit 4bbb3743 authored by 王金山's avatar 王金山

Merge branch 'DEV' into 'master'

新变更项:CAN信号控制指示灯,掉线熄灭

See merge request !46
parents a24a8ad7 d6738cdb
......@@ -1374,7 +1374,7 @@ void Telltales_Management(void)
if (((EMS_51C_STATUS & CAN_MSG_LOST) || (EMS_CylinderPressure > 64255)) && (LLM_EB4E_STATUS & CAN_MSG_LOST))
{
if (STEPPER_MOTOR_0_CUR_STEP <= 100)
TelltaleLCD_Flag33 = 1; //锟斤拷然锟斤拷锟斤拷锟斤拷锟斤拷状态指示锟斤拷
TelltaleLCD_Flag33 = 0; //锟斤拷然锟斤拷锟斤拷锟斤拷锟斤拷状态指示锟斤拷
}
else if (DataCoolantADblue < 10)//(EMS_CylinderPressure < 3200)
{
......
......@@ -867,7 +867,7 @@ void Telltale_LCD_Display(void)
else
TFT_LCD_Clear_Layer(LAYER_LED10);
*/
if ((AEBS_AdvancedEmergencyBrakingSysState == 0xE) || (AEBS_CollisionWarningLevel == 2) || (AEBS1_STATUS & CAN_MSG_LOST) ||\
if ((AEBS_AdvancedEmergencyBrakingSysState == 0xE) || (AEBS_CollisionWarningLevel == 2) /*|| (AEBS1_STATUS & CAN_MSG_LOST)*/ ||\
(AEBS_CollisionWarningLevel == 3) || (AEBS_CollisionWarningLevel == 5) || (AEBS_CollisionWarningLevel == 6))
{
TFT_LCD_Display_Sprite(LAYER_LED10, SN_zhishideng_10_png, 445, 9, 64);
......@@ -949,7 +949,7 @@ void Telltale_LCD_Display(void)
//保养指示灯(按里程)47 及 LDWS
if ((TelltaleLCDFlag.Sig.LCD21 == 0x1) &&
(((FLI1_STATUS & CAN_MSG_LOST) && (FLI2_STATUS & CAN_MSG_LOST)) ||
(/*((FLI1_STATUS & CAN_MSG_LOST) && (FLI2_STATUS & CAN_MSG_LOST)) ||*/
(AEBS_LaneDepartureImminentRight == 0x1) ||
(AEBS_LaneDepartureImminentLeft == 0x1) ||
(AEBS_LaneDepartureWarningSystemState == 0xE) ||
......@@ -971,7 +971,7 @@ void Telltale_LCD_Display(void)
}
else
{
if (((FLI1_STATUS & CAN_MSG_LOST) && (FLI2_STATUS & CAN_MSG_LOST)) ||\
if (/*((FLI1_STATUS & CAN_MSG_LOST) && (FLI2_STATUS & CAN_MSG_LOST)) ||\*/
(AEBS_LaneDepartureWarningSystemState == 0xE) ||\
((AEBS_LaneDepartureWarningSystemState == 0x0) && ((FLI2_STATUS & CAN_MSG_LOST) == 0)))
{
......@@ -996,7 +996,7 @@ void Telltale_LCD_Display(void)
Maintain_LDWS = 0;
TFT_LCD_Display_Sprite(LAYER_LED21, SN_zhishideng_22_png, 130, 266, 64);
}
else if (((FLI1_STATUS & CAN_MSG_LOST) && (FLI2_STATUS & CAN_MSG_LOST)) ||
else if (/*((FLI1_STATUS & CAN_MSG_LOST) && (FLI2_STATUS & CAN_MSG_LOST)) ||*/
(AEBS_LaneDepartureImminentRight == 0x1) ||
(AEBS_LaneDepartureImminentLeft == 0x1) ||
(AEBS_LaneDepartureWarningSystemState == 0xE) ||
......@@ -1004,7 +1004,7 @@ void Telltale_LCD_Display(void)
((AEBS_LaneDepartureWarningSystemState == 0x0) && ((FLI2_STATUS & CAN_MSG_LOST) == 0)))
{
Maintain_LDWS = 0;
if (((FLI1_STATUS & CAN_MSG_LOST) && (FLI2_STATUS & CAN_MSG_LOST)) ||\
if (/*((FLI1_STATUS & CAN_MSG_LOST) && (FLI2_STATUS & CAN_MSG_LOST)) ||\*/
(AEBS_LaneDepartureWarningSystemState == 0xE) ||\
((AEBS_LaneDepartureWarningSystemState == 0x0) && ((FLI2_STATUS & CAN_MSG_LOST) == 0)))
{
......
......@@ -55,6 +55,8 @@
//20251014 修改问题157008,再生禁止灯参与自检
//20260226 LDW、AEB、天然气气量低指示灯,信号掉线由点亮改成熄灭
#include "main.h"
#include "fuelconfig.h"
#include "UDS_ISO14229_Services.h"
......
1、完整版:WZ-EF01_BootApp_S00.16_FV0.09_260209.s19
2、升级版:WZ-EF01_UpdateApp_S00.16_F0.09_260209.s19
1、完整版:WZ-EF01_BootApp_S00.16_FV0.09_260228.s19
2、升级版:WZ-EF01_UpdateApp_S00.16_F0.09_260228.s19
3、FLASH: WZ_EF01_Flash_F0.09_FullBin_251111.bin
\ 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