Skip to content

W
WZ-EF01
Commit 9663cfa0 authored by 崔立宝's avatar 崔立宝
Browse files
Options

TYW-2023-0695变更为EF01

parent 8eb4fd05
Hide whitespace changes
Inline Side-by-side
Showing with 13760 additions and 13337 deletions
code/Sources/Application/inc/Common.h
View file @ 9663cfa0
......@@ -10,34 +10,34 @@
#include "TSzhen.h"
//图层
#define LAYER_BEIJING 0 //底图
#define LAYER_BEIJING 0 //底图
#define LAYER_BEIJING1 1 //底图
#define LAYER_VehicleL 2 //车速L
#define LAYER_VehicleR 3 //车速R
#define LAYER_ODO 4 //ODO与km
#define LAYER_ODO1 5 //
#define LAYER_ODO2 6 //
#define LAYER_ODO3 7 //
#define LAYER_ODO4 8 //
#define LAYER_ODO5 9 //
#define LAYER_ODO6 10 //
#define LAYER_Trip 11 //TRIP
#define LAYER_Trip1 12 //
#define LAYER_Trip2 13 //
#define LAYER_Trip3 14 //
#define LAYER_Trip4 15 //
#define LAYER_Gear 16 //档位
#define LAYER_Gear1 17 //档位1
#define LAYER_Gear2 18 //档位2
#define LAYER_Time_Hour1 19 //时间小时
#define LAYER_Time_Hour2 20 //时间小时
#define LAYER_Time_Dot 21 //时间冒号
#define LAYER_Time_Minute1 22 //时间分钟
#define LAYER_Time_Minute2 23 //时间分钟
#define LAYER_AirL1 24 //气压
#define LAYER_AirR1 25 //
#define LAYER_ODO2 6 //
#define LAYER_ODO3 7 //
#define LAYER_ODO4 8 //
#define LAYER_ODO5 9 //
#define LAYER_ODO6 10 //
#define LAYER_Trip 11 //TRIP
#define LAYER_Trip1 12 //
#define LAYER_Trip2 13 //
#define LAYER_Trip3 14 //
#define LAYER_Trip4 15 //
#define LAYER_Gear 16 //档位
#define LAYER_Gear1 17 //档位1
#define LAYER_Gear2 18 //档位2
#define LAYER_Time_Hour1 19 //时间小时
#define LAYER_Time_Hour2 20 //时间小时
#define LAYER_Time_Dot 21 //时间冒号
#define LAYER_Time_Minute1 22 //时间分钟
#define LAYER_Time_Minute2 23 //时间分钟
#define LAYER_AirL1 24 //气压
#define LAYER_AirR1 25 //
#define LAYER_EngineL 26 //转速L
#define LAYER_EngineR 27 //转速R
#define LAYER_Engine1 28 //转速数字
......@@ -45,7 +45,7 @@
#define LAYER_EngineDot 30 //转速数字
#define LAYER_Vehicle1 31 //车速数字
#define LAYER_Vehicle2 32 // 车速数字
#define LAYER_Vehicle2 32 // 车速数字
#define LAYER_Vehicle3 33 //车速数字
#define LAYER_TUINT 34 //温度单位
#define LAYER_TEMP1 35 //温度负号
......@@ -54,7 +54,7 @@
#define LAYER_LED01 38 //指示灯01
#define LAYER_LED02 39 //指示灯02
#define LAYER_LED03 40 //指示灯03
#define LAYER_LED04 41 //指示灯04
#define LAYER_LED04 41 //指示灯04
#define LAYER_LED05 42 //指示灯05
#define LAYER_LED06 43 //指示灯06
......@@ -84,26 +84,26 @@
#define LAYER_LED28 65 //指示灯28
#define LAYER_LED29 66 //指示灯29
#define LAYER_LED30 67 //指示灯30
//共享图层
#define LAYER_MENU01 68 //菜单层
#define LAYER_MENU02 69
#define LAYER_MENU03 70
#define LAYER_MENU04 71
#define LAYER_MENU05 72
#define LAYER_MENU06 73
#define LAYER_MENU07 74
#define LAYER_MENU08 75
#define LAYER_MENU09 76
#define LAYER_MENU10 77
#define LAYER_MENU11 78
#define LAYER_MENU12 79
#define LAYER_MENU13 80
#define LAYER_MENU14 81
#define LAYER_MENU01 68 //菜单层
#define LAYER_MENU02 69
#define LAYER_MENU03 70
#define LAYER_MENU04 71
#define LAYER_MENU05 72
#define LAYER_MENU06 73
#define LAYER_MENU07 74
#define LAYER_MENU08 75
#define LAYER_MENU09 76
#define LAYER_MENU10 77
#define LAYER_MENU11 78
#define LAYER_MENU12 79
#define LAYER_MENU13 80
#define LAYER_MENU14 81
#define LAYER_LED31 82 //指示灯31
#define LAYER_LED32 83 //指示灯32
#define LAYER_LED33 84 //指示灯33
//#define LAYER_POPUP_Text //报警图片
//#define LAYER_POPUP_Textwenzi //报警文字
......
code/Sources/Application/inc/Telltales.h
View file @ 9663cfa0
......@@ -63,6 +63,7 @@ extern uint8_t EPB_Count ;
extern uint8_t AEB_Count ;
extern uint8_t AMT_Count;
extern uint8_t LowBrakeLuidLevel_temp;
extern uint8_t LowBrakeLuidLevel_timp;
extern uint8_t SafetyBeltSt_temp;
extern uint8_t MaintainSignal_temp;
extern uint8_t ParkingBrakeSwitch_temp;
......@@ -71,6 +72,7 @@ extern uint8_t PositionLightSts;
extern uint8_t DriveDoorSts;
extern uint8_t PsngrDoorSts;
extern uint8_t LED_T_BOX_RVM;
extern uint8_t TelltaleLCD_Flag33;
//Ļָʾ״̬ʶ
typedef union
{
......
code/Sources/Application/src/Telltales.c
View file @ 9663cfa0
......@@ -10,7 +10,7 @@ TelltaleLRSimulateStruct TelltaleLSimulate;
TelltaleLRSimulateStruct TelltaleRSimulate;
TelltaleLCD TelltaleLCDFlag;
uint8_t HazardLightSts_Last;
uint8_t HazardLightSts_Last;
INT32U BD83790A;
INT32U BD83790B;
INT32U OldBD83790A;
......@@ -42,30 +42,32 @@ uint8_t EPB_Count ;
uint8_t AEB_Count ;
uint8_t AMT_Count;
uint8_t LowBrakeLuidLevel_temp;
uint8_t LowBrakeLuidLevel_timp;
uint8_t SafetyBeltSt_temp;
uint8_t MaintainSignal_temp;
uint8_t ParkingBrakeSwitch_temp;
uint8_t CabLockSt_temp;
uint8_t ASTL_Flag= 0 ;
uint8_t LED_T_BOX_RVM;
uint8_t TelltaleLCD_Flag33;
extern uint8_t BlTurnOffDelay;
/******************************************************************************
函数名：Telltales_Left_Right_Management_Service
功 能：左右转向灯控制
参 数：无
返回值：无
��������Telltales_Left_Right_Management_Service
�� �ܣ�����ת��ƿ���
�� ������
����ֵ����
*******************************************************************************/
void Telltales_Left_Right_Management_Service(void) //10ms
{
}
/******************************************************************************
函数名：Telltales_Management_Service
功 能：指示灯管理服务
参 数：无
返回值：无
��������Telltales_Management_Service
�� �ܣ�ָʾ�ƹ�������
�� ������
����ֵ����
*******************************************************************************
注 意：该服务函数必须每50ms被调用一次
ע �⣺�÷���������ÿ50ms������һ��
******************************************************************************/
uint8_t hyq;
uint8_t PositionLightSts_Count;
......@@ -138,7 +140,7 @@ void Telltales_Management(void)
{
//警示灯
//��ʾ��
if(HazardLightSts==1)
{
BD83790A |= BD8379_D1;
......@@ -154,7 +156,7 @@ void Telltales_Management(void)
}
else
{
//2 右转向 15 30
//2 ��ת�� 15 30
if(RHTurnSignalSts == 1)
{
BD83790A |= BD8379_D1;
......@@ -173,7 +175,7 @@ void Telltales_Management(void)
LED_RIGHT_WHITE = 0 ;
}
//1 左转向指示灯 15 30
//1 ��ת��ָʾ�� 15 30
if(LHTurnSignalSts == 1)
{
BD83790A |= BD8379_D7;
......@@ -215,7 +217,7 @@ void Telltales_Management(void)
HazardLightSts_Last = HazardLightSts;
Edge = HazardLightSts;
}
//左右转向声音播放
//����ת����������
if (Edge != 0xFF)
{
if(Edge)
......@@ -229,13 +231,13 @@ void Telltales_Management(void)
Sound_Delete(SND_TOCK);
}
*/
if(PepslcuAlarm==13) // 闭锁时钥匙在车内
{
Sound_Request(SND_LockWithKeyInCar, 1);
}
if (PepslcuAlarm == 13) // ����ʱԿ���ڳ���
{
Sound_Request(SND_LockWithKeyInCar, 1);
}
else
Sound_Delete(SND_LockWithKeyInCar);
//5 远光指示灯 15 30
//5 Զ��ָʾ�� 15 30
if(HighBeamSts == 1)
BD83790A |= BD8379_D8;
else
......@@ -247,14 +249,14 @@ void Telltales_Management(void)
// else
BD83790A &= ~BD8379_D0;
//2 右转向 15 30
//2 ��ת�� 15 30
//if(hyq == 1)
// BD83790A |= BD8379_D1;
//else
// BD83790A &= ~BD8379_D1;
//27 发动机系统一般故障 （原 SVS 指示灯） 15
if(NVM_CONFIG_WEI>0) //潍柴
//27 ������ϵͳһ����� ��ԭ SVS ָʾ�ƣ� 15
if(NVM_CONFIG_WEI>0) //��
{
if((EngineMalfunctionLamp_WEI==1)||(EngineMalfunctionLamp_YUN==1))
BD83790A |= BD8379_D2;
......@@ -269,28 +271,28 @@ void Telltales_Management(void)
BD83790A &= ~BD8379_D2;
}
else if((NVM_CONFIG_DA>0)||(NVM_CONFIG_KANG>0)||(NVM_CONFIG_XI>0)) //大柴、康明斯、锡柴
else if((NVM_CONFIG_DA>0)||(NVM_CONFIG_KANG>0)||(NVM_CONFIG_XI>0)) //��񡢿���˹������
{
if(EngineMalfunctionLamp_DAKANG==1)
BD83790A |= BD8379_D2;
else
BD83790A &= ~BD8379_D2;
}
else if(NVM_CONFIG_YUN>0) //云柴
else if(NVM_CONFIG_YUN>0) //�Ʋ�
{
if(EngineMalfunctionLamp_YUN==1)
BD83790A |= BD8379_D2;
else
BD83790A &= ~BD8379_D2;
}
else if(NVM_CONFIG_YU>0)//玉柴
else if(NVM_CONFIG_YU>0)//���
{
if((EngineMalfunctionLamp1==1)&&(EngineMalfunctionLamp2==3))
BD83790A |= BD8379_D2;
else if((EngineMalfunctionLamp1==0)&&(EngineMalfunctionLamp2==3))
BD83790A &= ~BD8379_D2;
}
//29 发动机系统严重故障 (原发动机停机) 15
//29 ������ϵͳ���ع��� (ԭ������ͣ��) 15
// #if ModVersion == Version_KANG
if(NVM_CONFIG_KANG>0)
{
......@@ -379,7 +381,7 @@ void Telltales_Management(void)
else
BD83790A &= ~BD8379_D3;
//28 MIL 灯 发动机排放相关故障 15
//28 MIL �� �������ŷ���ع��� 15
if(NVM_CONFIG_WEI>0)
{
if((OBDMalfunctionindLamp_WEI==1)||(OBDMalfunctionindLamp_KANGYU==1))
......@@ -397,7 +399,7 @@ void Telltales_Management(void)
else
{
if(OBDMalfunctionindLamp_KANGYU==1) //(康明斯、玉柴、大柴、锡柴、云内)
if(OBDMalfunctionindLamp_KANGYU==1) //(����˹����񡢴����������)
BD83790A |= BD8379_D4;
else
BD83790A &= ~BD8379_D4;
......@@ -408,7 +410,7 @@ void Telltales_Management(void)
// else
BD83790A &= ~BD8379_D5;
//31 机油压力低 EngOilPress 15
//31 ����ѹ���� EngOilPress 15
// #if ModVersion == Version_KANG
if(NVM_CONFIG_KANG>0)
......@@ -454,7 +456,7 @@ void Telltales_Management(void)
}
else
{
if((EngOilPress<25)||((EngOilPress*2)>325)) //＜100Kpa，＞650Kpa
if((EngOilPress<25)||((EngOilPress*2)>325)) //��100Kpa����650Kpa
{
BD83790A |= BD8379_D6;
if(EngOilPress_Count<=60)
......@@ -493,19 +495,19 @@ void Telltales_Management(void)
BD83790A &= ~BD8379_D6;
}
}
//1 左转向指示灯 15 30
//1 ��ת��ָʾ�� 15 30
//if(hyq == 7)
// BD83790A |= BD8379_D7;
//else
// BD83790A &= ~BD8379_D7;
//5 远光指示灯 15 30
//5 Զ��ָʾ�� 15 30
//if(hyq == 8)
// BD83790A |= BD8379_D8;
//else
// BD83790A &= ~BD8379_D8;
//22 油液位低 15
//22 ��Һλ�� 15
if(((Fuel_Seg/10)< 2)&&(IO_DISP_TEST_OFF_TIME >= 40))
{
Sound_Request(SND_LOW_FUEL_SPEED, 1);
......@@ -516,7 +518,7 @@ void Telltales_Management(void)
Sound_Delete(SND_LOW_FUEL_SPEED);
BD83790A &= ~BD8379_D9;
}
//10 驻车制动指示灯 15
//10 פ���ƶ�ָʾ�� 15
if((LINE_IN_BREAK_SIGNAL)||(EPB_State==1))
{
Break_down_count=0;
......@@ -561,7 +563,7 @@ void Telltales_Management(void)
if(Brake_Switch==1) //20200302
{
Break_down_count=0;
BD83790A &= ~BD8379_D10;//驻车制动
BD83790A &= ~BD8379_D10;//פ���ƶ�
Sound_Delete(SND_Break_down);
}
else
......@@ -573,11 +575,11 @@ void Telltales_Management(void)
{
if(FLASH_SYNC_1Hz)
{
BD83790A |= BD8379_D10;//驻车制动
BD83790A |= BD8379_D10;//פ���ƶ�
}
else
{
BD83790A &= ~BD8379_D10;//驻车制动
BD83790A &= ~BD8379_D10;//פ���ƶ�
}
Sound_Request(SND_Break_down,1);
if(Break_nodown_Count<=60)
......@@ -606,7 +608,7 @@ void Telltales_Management(void)
else
{
Break_down_count++;
BD83790A &= ~BD8379_D10;//驻车制动
BD83790A &= ~BD8379_D10;//פ���ƶ�
Sound_Delete(SND_Break_down);
if((Break_nodown_Count>0)&&(Break_nodown_Count<=60))
{
......@@ -621,7 +623,7 @@ void Telltales_Management(void)
else
{
Break_down_count=0;
BD83790A &= ~BD8379_D10;//驻车制动
BD83790A &= ~BD8379_D10;//פ���ƶ�
Sound_Delete(SND_Break_down);
if((Break_nodown_Count>0)&&(Break_nodown_Count<=60))
{
......@@ -634,7 +636,7 @@ void Telltales_Management(void)
}
}
}
//7 安全带未系报警灯 15
//7 ��ȫ��δϵ������ 15
// if(((DataVSpeedActual>0)||(ActualGearPosition>0))&&(LINE_IN_SEATBELT_SIGNAL)&&(LINE_IN_BREAK_SIGNAL==0))
// if((DataVSpeedActual>=150)&&(LINE_IN_SEATBELT_SIGNAL)) //20190721
......@@ -705,12 +707,12 @@ void Telltales_Management(void)
// else
BD83790B &= ~BD8379_D0;
//6 ABS 故障灯 15
//6 ABS ���ϵ� 15
if((ABS_EBS_AmberWarningSignal == 1)&&(ABS_FullyOperation == 0))
BD83790B |= BD8379_D1;
else
BD83790B &= ~BD8379_D1;
//35 需要再生 黄色 15
//35 ��Ҫ���� ��ɫ 15
if((NVM_CONFIG_YU>0)||(NVM_CONFIG_KANG>0))
{
BD83790B &= ~BD8379_D2;
......@@ -840,7 +842,7 @@ else if((NVM_CONFIG_YUN>0)||(NVM_CONFIG_WEI>0))
BD83790B |= BD8379_D3;
else
BD83790B &= ~BD8379_D3;
if((DPF_Lamp_Status==2)||(DPF_Lamp_Status==4)) //36 需要服务再生 红色 15
if((DPF_Lamp_Status==2)||(DPF_Lamp_Status==4)) //36 ��Ҫ�������� ��ɫ 15
{
if (DPF_Lamp_Status==2)
{
......@@ -891,7 +893,8 @@ else if((NVM_CONFIG_YUN>0)||(NVM_CONFIG_WEI>0))
}
}
//25 尿素液位低 ＜18%报警 >21%解除报警 20201208 15
//25 ����Һλ�� ��18%���� >21%������� 20201208 15
#if 0
if(Aftrtrtmnt1SCRCatalystTankLevel<45)
{
BD83790B |= BD8379_D4;
......@@ -913,6 +916,7 @@ else if((NVM_CONFIG_YUN>0)||(NVM_CONFIG_WEI>0))
BD83790B &= ~BD8379_D4;
}
}
#endif
/*#if ModVersion != Version_WEI
if(Urealevelalarm==1)
BD83790B |= BD8379_D4;
......@@ -927,7 +931,7 @@ else if((NVM_CONFIG_YUN>0)||(NVM_CONFIG_WEI>0))
BD83790B &= ~BD8379_D4;
#endif */
//37 禁止主动再生 15
//37 ��ֹ�������� 15
//#if ModVersion != Version_KANG
if((NVM_CONFIG_DA>0)||(NVM_CONFIG_XI>0))
{
......@@ -1058,7 +1062,7 @@ else if((NVM_CONFIG_YUN>0)||(NVM_CONFIG_WEI>0))
}
}
/*
else if(NVM_CONFIG_KANG>0)//常亮被删除
else if(NVM_CONFIG_KANG>0)//������ɾ��
{
if(DPF_Forbidden_Lamp_YUN==1)
{
......@@ -1086,21 +1090,21 @@ else if((NVM_CONFIG_YUN>0)||(NVM_CONFIG_WEI>0))
// else
BD83790B &= ~BD8379_D6;
//3 前雾灯指示灯 15
//3 ǰ����ָʾ�� 15
if(FrontFogSts == 1)
BD83790B |= BD8379_D7;
else
BD83790B &= ~BD8379_D7;
//4 后雾灯指示灯 15
//4 ������ָʾ�� 15
if(RearFogSts == 1)
BD83790B |= BD8379_D8;
else
BD83790B &= ~BD8379_D8;
//30 发动机水温高 15
// if(Engine_Coolant_Temp>144) //报警值统一为＞104℃
if(DataCoolantTempSegDisp>105) //20200925 与走格对应，有延时
//30 ������ˮ�¸� 15
// if(Engine_Coolant_Temp>144) //����ֵͳһΪ��104��
if(DataCoolantTempSegDisp>105) //20200925 ���߸��Ӧ������ʱ
{
BD83790B |= BD8379_D9;
if(Coolant_Temp_Count<=60)
......@@ -1141,7 +1145,7 @@ else if((NVM_CONFIG_YUN>0)||(NVM_CONFIG_WEI>0))
}
//22 充电指示系统故障 15
//22 ���ָʾϵͳ���� 15
if(LINE_IN_CHARGE_SIGNAL)
{
BD83790B |= BD8379_D10;
......@@ -1191,21 +1195,21 @@ else if((NVM_CONFIG_YUN>0)||(NVM_CONFIG_WEI>0))
//----hyq--20190504--屏幕指示灯标志
//驾驶员报警系统(玉柴)
//----hyq--20190504--��Ļָʾ�Ʊ�־
//��ʻԱ����ϵͳ(���)
if(NVM_CONFIG_YU>0)
{
if(DriverAlarmSystem_YU==1)
TelltaleLCDFlag.Sig.LCD01 = 1; //技术需求33
TelltaleLCDFlag.Sig.LCD01 = 1; //��������33
else
TelltaleLCDFlag.Sig.LCD01 = 0;
}
//驾驶员报警系统(潍柴)
//��ʻԱ����ϵͳ(Ϋ��)
if(NVM_CONFIG_WEI>0)
{
if((DriverAlarmSystem_KANGWEI==1)||( DriverAlarmSystem_KANGWEI==4 )||( DrivabilityRestrictionsystem==3 ))
TelltaleLCDFlag.Sig.LCD01 = 1; //技术需求33
TelltaleLCDFlag.Sig.LCD01 = 1; //��������33
else if(DrivabilityRestrictionsystem==5)
{
if(FLASH_SYNC_2Hz)
......@@ -1253,11 +1257,11 @@ else if((NVM_CONFIG_YUN>0)||(NVM_CONFIG_WEI>0))
}
}
//驾驶员报警系统(康明斯)
//��ʻԱ����ϵͳ(����˹)
if(NVM_CONFIG_KANG>0)
{
if(DriverAlarmSystem_KANGWEI==1)
TelltaleLCDFlag.Sig.LCD01 = 1; //技术需求33
TelltaleLCDFlag.Sig.LCD01 = 1; //��������33
else if(DriverAlarmSystem_KANGWEI==4)
{
if(FLASH_SYNC_1Hz)
......@@ -1268,11 +1272,11 @@ else if((NVM_CONFIG_YUN>0)||(NVM_CONFIG_WEI>0))
else
TelltaleLCDFlag.Sig.LCD01 = 0;
}
//驾驶员报警系统(大柴) 锡柴
//��ʻԱ����ϵͳ(���) ����
if((NVM_CONFIG_DA>0)||(NVM_CONFIG_XI>0))
{
if(DriverAlarmSystem_DA==1)
TelltaleLCDFlag.Sig.LCD01 = 1; //技术需求33
TelltaleLCDFlag.Sig.LCD01 = 1; //��������33
else if(DriverAlarmSystem_DA==2)
{
if(FLASH_SYNC_1Hz)
......@@ -1290,18 +1294,18 @@ else if((NVM_CONFIG_YUN>0)||(NVM_CONFIG_WEI>0))
else
TelltaleLCDFlag.Sig.LCD01 = 0;
}
//驾驶员报警系统 云内
//��ʻԱ����ϵͳ ����
if(NVM_CONFIG_YUN>0)
{
if((DriverAlarmSystem_YUN>0)&&(DriverAlarmSystem_YUN<6)) //报文矩阵并未明确不同数值灯如何亮
TelltaleLCDFlag.Sig.LCD01 = 1; //技术需求33
if((DriverAlarmSystem_YUN>0)&&(DriverAlarmSystem_YUN<6)) //���ľ���δ��ȷ��ͬ��ֵ�������
TelltaleLCDFlag.Sig.LCD01 = 1; //��������33
else
TelltaleLCDFlag.Sig.LCD01 = 0;
}
//制动气压低报警灯 ≤0.45Mpa，≥1.2Mpa 仪表判断报警
//�ƶ���ѹ�ͱ����� ��0.45Mpa����1.2Mpa �DZ��жϱ���
if(((DataHiCollantAirTWarning==1)||(DataHiCollantAirOWarning==1))&&(IO_DISP_TEST_OFF_TIME>50))
{
TelltaleLCDFlag.Sig.LCD02 = 1; //技术需求17
TelltaleLCDFlag.Sig.LCD02 = 1; //��������17
#if CODEMODE==Normal
Sound_Request(SND_BreakPressure, 1);
#endif
......@@ -1342,11 +1346,47 @@ else if((NVM_CONFIG_YUN>0)||(NVM_CONFIG_WEI>0))
TelltaleLCDFlag.Sig.LCD02 = 0;
Sound_Delete(SND_BreakPressure);
}
if (EMS_CNGLampStatus == 1)
TelltaleLCDFlag.Sig.LCD31 = 1; //��Ȼ��״ָ̬ʾ��
else
TelltaleLCDFlag.Sig.LCD31 = 0;
if (EMS_GasLeakIndicator == 1)
{
TelltaleLCDFlag.Sig.LCD32 = 1; //��Ȼ��й¶ָʾ��
Sound_Request(SND_CNG_GasLeak, 1);
}
else
{
TelltaleLCDFlag.Sig.LCD32 = 0;
Sound_Delete(SND_CNG_GasLeak);
}
//空滤阻塞 硬线 21
if(LINE_IN_FILT_BLOCK_SIGNAL)
if ((EMS_51C_STATUS & CAN_MSG_LOST) || (EMS_CylinderPressure > 64255))
{
if (STEPPER_MOTOR_0_CUR_STEP <= 100)
TelltaleLCD_Flag33 = 1; //��Ȼ��������״ָ̬ʾ��
}
else if (EMS_CylinderPressure < 3200)
{
if (STEPPER_MOTOR_0_CUR_STEP <= 223)
TelltaleLCD_Flag33 = FLASH_SYNC_1Hz;
}
else if (EMS_CylinderPressure < 5000)
{
if (STEPPER_MOTOR_0_CUR_STEP <= 460)
TelltaleLCD_Flag33 = 1; //��Ȼ��������״ָ̬ʾ��
}
else if (EMS_CylinderPressure >= 6200)
{
if (STEPPER_MOTOR_0_CUR_STEP >= 582)
TelltaleLCD_Flag33 = 0;
}
//�������� Ӳ�� 21
if (LINE_IN_FILT_BLOCK_SIGNAL)
{
TelltaleLCDFlag.Sig.LCD03 = 1; //技术需求17
TelltaleLCDFlag.Sig.LCD03 = 1; //��������17
if(FILT_BLOCK_Count<=60)
{
FILT_BLOCK_Count++;
......@@ -1385,7 +1425,7 @@ else if((NVM_CONFIG_YUN>0)||(NVM_CONFIG_WEI>0))
}
//EBS EBS红灯警告 42
//EBS EBS��ƾ��� 42
if(NVM_CONFIG_EBS==0) //20190808
{
if(ABS_EBS_AmberWarningSignal==1)
......@@ -1395,10 +1435,10 @@ else if((NVM_CONFIG_YUN>0)||(NVM_CONFIG_WEI>0))
}
else
TelltaleLCDFlag.Sig.LCD04 = 0;
//制动系统故障灯 11 采用气压信号，低有效 此处为行车制动报警，制动气压或制动液位低时，该灯也要亮起
//�ƶ�ϵͳ���ϵ� 11 ������ѹ�źţ�����Ч �˴�Ϊ�г��ƶ��������ƶ���ѹ���ƶ�Һλ��ʱ���õ�ҲҪ����
// if(((LINE_IN_BREAK_FLUID_SIGNAL)||(DataHiCollantAirTWarning==1)||(DataHiCollantAirOWarning==1))&&(IO_DISP_TEST_OFF_TIME>50))
if(DATA_OVER_SPEED_WARNING) //超速
if(DATA_OVER_SPEED_WARNING) //����
{
TelltaleLCDFlag.Sig.LCD05 = 1;
Sound_Request(SND_OVER_SPEED, 1);
......@@ -1440,8 +1480,8 @@ else if((NVM_CONFIG_YUN>0)||(NVM_CONFIG_WEI>0))
OVER_SPEED_Count=0;
}
//RVM灯
if (((RMS_Fault>=1)&&(RMS_Fault<=4))||(T_BOX_RVM_STATUS&CAN_MSG_LOST))//掉线
//RVM��
if (((RMS_Fault>=1)&&(RMS_Fault<=4))||(T_BOX_RVM_STATUS&CAN_MSG_LOST))//����
{
LED_T_BOX_RVM = 1;
}
......@@ -1451,7 +1491,7 @@ else if((NVM_CONFIG_YUN>0)||(NVM_CONFIG_WEI>0))
}
//门开报警灯 KL30 技术需求15 更新至需求3.0
//�ſ������� KL30 ��������15 ����������3.0
// if(((DataVSpeedActual>0)||(ActualGearPosition>0))&&((DriveDoorSts==1)||(PsngrDoorSts==1)))
if((DriveDoorSts==1)||(PsngrDoorSts==1))
{
......@@ -1510,7 +1550,7 @@ else if((NVM_CONFIG_YUN>0)||(NVM_CONFIG_WEI>0))
Sound_Delete(SND_DOOR_OPENED);
}
//驾驶室未锁止报警灯 低有效 16
//��ʻ��δ��ֹ������ ����Ч 16
if(LINE_IN_CAB_LOCK_SIGNAL)
{
CabLockSt_temp=1;
......@@ -1554,7 +1594,7 @@ else if((NVM_CONFIG_YUN>0)||(NVM_CONFIG_WEI>0))
}
// 高排气温度报警灯 38
// �������¶ȱ����� 38
// #if ModVersion == Version_KANG
if((NVM_CONFIG_KANG>0)||(NVM_CONFIG_YUN>0))
{
......@@ -1566,13 +1606,13 @@ else if((NVM_CONFIG_YUN>0)||(NVM_CONFIG_WEI>0))
else
TelltaleLCDFlag.Sig.LCD08 = 0;
// 发动机预热 32
// ������Ԥ�� 32
if(EngWaitToStartLamp==1)
TelltaleLCDFlag.Sig.LCD09 = 1;
else
TelltaleLCDFlag.Sig.LCD09 = 0;
//AEB 灯 44
//AEB �� 44
if(NVM_CONFIG_AEB==0)
{
if((AEB_State==2)|| (AEB_State==3)|| (AEB_State==5)|| (AEB_State==6)|| (AEB_State==7))
......@@ -1620,20 +1660,20 @@ else if((NVM_CONFIG_YUN>0)||(NVM_CONFIG_WEI>0))
else
TelltaleLCDFlag.Sig.LCD10 = 0;
//小灯 KL15，KL30 48
//�� KL15��KL30 48
if(PositionLightSts==1)
TelltaleLCDFlag.Sig.LCD11 = 1;
else
TelltaleLCDFlag.Sig.LCD11 = 0;
//后视镜除霜 KL30 39
//���Ӿ���˪ KL30 39
if(RearviewMirrorDefSts==1)
TelltaleLCDFlag.Sig.LCD12 = 1;
else
TelltaleLCDFlag.Sig.LCD12 = 0;
//变速器故障 41
if(AMT_Warning_Lamp == 1 ) //20201008添加大C闪烁三次
//���������� 41
if(AMT_Warning_Lamp == 1 ) //20201008���Ӵ�C��˸����
{
TelltaleLCDFlag.Sig.LCD13 = 1;
if(AMT_Count<=60)
......@@ -1673,7 +1713,7 @@ else if((NVM_CONFIG_YUN>0)||(NVM_CONFIG_WEI>0))
AMT_Count=0;
}
if(NVM_CONFIG_ESC==0)
//ESC 故障指示灯 13
//ESC ����ָʾ�� 13
{
if((VDC_Information_Signal == 0X01)&& (VDC_Fully_Operational==0)&& (ASR_OffRoad_Switch==0))
TelltaleLCDFlag.Sig.LCD14 = 1;
......@@ -1687,7 +1727,7 @@ else if((NVM_CONFIG_YUN>0)||(NVM_CONFIG_WEI>0))
else
TelltaleLCDFlag.Sig.LCD14 = 0;
//ESC OFF 关闭指示灯 14
//ESC OFF �ر�ָʾ�� 14
/* if( NVM_CONFIG_EBS==0)
{
......@@ -1712,10 +1752,10 @@ else if((NVM_CONFIG_YUN>0)||(NVM_CONFIG_WEI>0))
TelltaleLCDFlag.Sig.LCD15 = 0;
}
//排气制动工作指示 24
//�����ƶ�����ָʾ 24
if((NVM_CONFIG_DA>0)||(NVM_CONFIG_XI>0)||(NVM_CONFIG_YUN>0))
{
if (Retarder_Request_BrakeLight>=125) //偏移量-125 7D即125 7D灭，其它亮
if (Retarder_Request_BrakeLight>=125) //ƫ����-125 7D��125 7D��������
{
TelltaleLCDFlag.Sig.LCD16 = 0;
}
......@@ -1743,7 +1783,7 @@ else if((NVM_CONFIG_YUN>0)||(NVM_CONFIG_WEI>0))
else
TelltaleLCDFlag.Sig.LCD16 = 0;
}
//EPS故障指示灯 46
//EPS����ָʾ�� 46
/* if( NVM_CONFIG_EPS==0)
{
if(EPS_Status_signal==2)
......@@ -1755,12 +1795,12 @@ else if((NVM_CONFIG_YUN>0)||(NVM_CONFIG_WEI>0))
TelltaleLCDFlag.Sig.LCD17 = 0;
*/
//近光灯
//�����
if(LowBeamSts==1)
TelltaleLCDFlag.Sig.LCD17 = 1;
else
TelltaleLCDFlag.Sig.LCD17 = 0;
//ASR指示灯 8
//ASRָʾ�� 8
if(NVM_CONFIG_ASR==0)
{
if((ASR_OffRoad_Switch==1)&&(ASR_Driver_Info_Signal==1))
......@@ -1778,7 +1818,7 @@ else if((NVM_CONFIG_YUN>0)||(NVM_CONFIG_WEI>0))
else
TelltaleLCDFlag.Sig.LCD18 = 0;
//EPB 故障灯 45
//EPB ���ϵ� 45
if( NVM_CONFIG_EPB==0 )
{
if(EPB_Lamp_State)
......@@ -1823,8 +1863,8 @@ else if((NVM_CONFIG_YUN>0)||(NVM_CONFIG_WEI>0))
}
else
TelltaleLCDFlag.Sig.LCD19 = 0;
//燃油中有水 23
// if(NVM_CONFIG_XI>0) //锡柴
//ȼ������ˮ 23
// if(NVM_CONFIG_XI>0) //����
// {
if(WaterInFuelIndicator == 1 ) //20200925
TelltaleLCDFlag.Sig.LCD20 = 1;
......@@ -1839,7 +1879,7 @@ else if((NVM_CONFIG_YUN>0)||(NVM_CONFIG_WEI>0))
TelltaleLCDFlag.Sig.LCD20 = 0;
}
*/
//保养指示灯（按里程）47
//����ָʾ�ƣ�����̣�47
if(Maintain_alarm==1)
{
if(Maintain_clear==1)
......@@ -1861,10 +1901,10 @@ else if((NVM_CONFIG_YUN>0)||(NVM_CONFIG_WEI>0))
}
if(NVM_CONFIG_EPB==0)
{
//Auto hold 指示灯绿色 Auto hold 故障指示红色 20
//Auto hold ָʾ����ɫ Auto hold ����ָʾ��ɫ 20
if(AutoHold==6)
TelltaleLCDFlag.Sig.LCD22 = 1;
else if(AutoHold==5) //闪烁
else if(AutoHold==5) //��˸
{
if(FLASH_SYNC_2Hz)
TelltaleLCDFlag.Sig.LCD22 = 1;
......@@ -1877,11 +1917,18 @@ else if((NVM_CONFIG_YUN>0)||(NVM_CONFIG_WEI>0))
}
else
TelltaleLCDFlag.Sig.LCD22 = 0;
// 制动液位低报警灯 9
// �ƶ�Һλ�ͱ����� 9
if(LINE_IN_BREAK_FLUID_SIGNAL) //
{
LowBrakeLuidLevel_temp=1;
TelltaleLCDFlag.Sig.LCD23 = 1;
if (LowBrakeLuidLevel_timp < 100)
{
LowBrakeLuidLevel_timp++;
}
else
{
LowBrakeLuidLevel_temp=1;
TelltaleLCDFlag.Sig.LCD23 = 1;
}
if(BREAK_FLUID_Count<=60)
{
BREAK_FLUID_Count++;
......@@ -1908,6 +1955,7 @@ else if((NVM_CONFIG_YUN>0)||(NVM_CONFIG_WEI>0))
}
else
{
LowBrakeLuidLevel_timp=0;
LowBrakeLuidLevel_temp=0;
if((BREAK_FLUID_Count>0)&&(BREAK_FLUID_Count<=60))
{
......@@ -1919,15 +1967,16 @@ else if((NVM_CONFIG_YUN>0)||(NVM_CONFIG_WEI>0))
BREAK_FLUID_Count=0;
TelltaleLCDFlag.Sig.LCD23 = 0;
}
//CCS 绿灯 43
if((NVM_CONFIG_DA>0)||(NVM_CONFIG_XI>0)||(NVM_CONFIG_YUN>0))
//CCS �̵� 43
//if((NVM_CONFIG_DA>0)||(NVM_CONFIG_XI>0)||(NVM_CONFIG_YUN>0))
{
if(CruiseCtrlActive_DA==1)
TelltaleLCDFlag.Sig.LCD24 = 1;
else if(CruiseCtrlActive_DA==0)
TelltaleLCDFlag.Sig.LCD24 = 0;
if(CruiseCtrlActive_DA == 1)
TelltaleLCDFlag.Sig.LCD24 = 1;
else //if(CruiseCtrlActive_DA==0)
TelltaleLCDFlag.Sig.LCD24 = 0;
}
else if(NVM_CONFIG_YU>0) //20200907
#if 0
/*else*/ if(NVM_CONFIG_YU>0) //20200907
{
if((CruiseCtrlActive_FEIDA>=1)&&(CruiseCtrlActive_FEIDA<=6))
TelltaleLCDFlag.Sig.LCD24 = 1;
......@@ -1941,8 +1990,9 @@ else if((NVM_CONFIG_YUN>0)||(NVM_CONFIG_WEI>0))
else if(CruiseCtrlActive_FEIDA==0)
TelltaleLCDFlag.Sig.LCD24 = 0;
}
#endif
//#if ModVersion == Version_KANG
//怠速起停功能开启绿色 40 潍柴:没有；康明斯:有；玉柴:没有
//������ͣ���ܿ�����ɫ 40 Ϋ��:û�У�����˹:�У����:û��
if(NVM_CONFIG_KANG>0)
{
if(Stop_Start_System_Public==3)
......@@ -1950,7 +2000,7 @@ else if((NVM_CONFIG_YUN>0)||(NVM_CONFIG_WEI>0))
else
TelltaleLCDFlag.Sig.LCD25 = 0;
if(Stop_Start_System_Public==9) //改为黄色
if(Stop_Start_System_Public==9) //��Ϊ��ɫ
TelltaleLCDFlag.Sig.LCD26 = 1;
else if(Stop_Start_System_Public==2)
{
......@@ -1961,14 +2011,14 @@ else if((NVM_CONFIG_YUN>0)||(NVM_CONFIG_WEI>0))
}
else
TelltaleLCDFlag.Sig.LCD26 = 0;
//怠速起停功能关闭红色 40 潍柴:没有；康明斯:有；玉柴:没有
//������ͣ���ܹرպ�ɫ 40 Ϋ��:û�У�����˹:�У����:û��
}
else
{
TelltaleLCDFlag.Sig.LCD25 = 0;
TelltaleLCDFlag.Sig.LCD26 = 0;
}
// PTO 工作指示灯 18
// PTO ����ָʾ�� 18
if(NVM_CONFIG_PTO==0 )
{
if(LINE_IN_PTO_SIGNAL)
......@@ -2018,7 +2068,7 @@ else
Sound_Delete(SND_PTO);
TelltaleLCDFlag.Sig.LCD27 = 0;
}
//制动灯断丝报警灯 19
//�ƶ��ƶ�˿������ 19
if(BreakLightWarning)
{
TelltaleLCDFlag.Sig.LCD28 = 1;
......@@ -2059,7 +2109,7 @@ else
TelltaleLCDFlag.Sig.LCD28 = 0;
}
//前桥蹄片报警灯 12
//ǰ����Ƭ������ 12
if(LINE_IN_RF_HOOVES_SIGNAL)
{
TelltaleLCDFlag.Sig.LCD29 = 1;
......@@ -2100,7 +2150,7 @@ else
TelltaleLCDFlag.Sig.LCD29 = 0;
}
//后桥蹄片报警灯 12
//������Ƭ������ 12
if(LINE_IN_RR_HOOVES_SIGNAL)
{
TelltaleLCDFlag.Sig.LCD30 = 1;
......@@ -2148,19 +2198,19 @@ else
ASTL_Flag= 0 ;
TelltaleLCDFlag.Telltale =0x00000000;
if(PepslcuAlarm==13) // 闭锁时钥匙在车内
if(PepslcuAlarm==13) // ����ʱԿ���ڳ���
{
Sound_Request(SND_LockWithKeyInCar, 1);
}
else
Sound_Delete(SND_LockWithKeyInCar);
Sound_Delete(SND_BreakPressure);
//5 远光指示灯 15 30
//5 Զ��ָʾ�� 15 30
if(HighBeamSts == 1)
BD83790A |= BD8379_D8;
else
BD83790A &= ~BD8379_D8;
//近光灯
//�����
if(LowBeamSts==1)
TelltaleLCDFlag.Sig.LCD17 = 1;
else
......@@ -2168,7 +2218,7 @@ else
LED_RIGHT_WHITE = 1 ;
LED_LEFT_WHITE = 1 ;
//门开报警灯 KL30 技术需求15 车速＞0 或者档位为P 档，N 档，M档，R 档时 ????
//�ſ������� KL30 ��������15 ���٣�0 ���ߵ�λΪP ����N ����M����R ��ʱ ????
// if(((DataVSpeedActual>0)||(ActualGearPosition>0))&&((DriveDoorSts==1)||(PsngrDoorSts==1)))
if((HazardLightSts==1)&&(BlTurnOffDelay == 0))
{
......@@ -2239,20 +2289,20 @@ else
DoorSts_Count=0;
Sound_Delete(SND_DOOR_OPENED);
}
//后视镜除霜 KL30 39
//���Ӿ���˪ KL30 39
// if(RearviewMirrorDefSts)
// TelltaleLCDFlag.Sig.LCD12 = 1;
// else
TelltaleLCDFlag.Sig.LCD12 = 0;
//小灯 KL15，KL30 48
//�� KL15��KL30 48
if(PositionLightSts==1)
TelltaleLCDFlag.Sig.LCD11 = 1;
else
TelltaleLCDFlag.Sig.LCD11 = 0;
// if((DriveDoorSts==1)||(PsngrDoorSts==1))
// {
// TFT_LCD_Display_Sprite(LAYER_LED06, SN_zhishideng_06_png, 265, 9, 64); //门开报警灯 KL30 技术需求15
// TFT_LCD_Display_Sprite(LAYER_LED06, SN_zhishideng_06_png, 265, 9, 64); //�ſ������� KL30 ��������15
// }
// if(PositionLightSts==1)
// {
......@@ -2260,17 +2310,17 @@ else
// }
BD83790B &= ~BD8379_D10;//充电故障
BD83790B &= ~BD8379_D10;//������
if( NVM_CONFIG_EPB==0 ) //20200609fhl
{
BD83790A &= ~BD8379_D10;//驻车制动
BD83790A &= ~BD8379_D10;//פ���ƶ�
Sound_Delete(SND_Break_down);
}
else
{
if((LINE_IN_BREAK_SIGNAL)||(Brake_Switch==1)) //20200302
{
BD83790A &= ~BD8379_D10;//驻车制动
BD83790A &= ~BD8379_D10;//פ���ƶ�
Sound_Delete(SND_Break_down);
if((Break_nodown_Count>0)&&(Break_nodown_Count<=60))
{
......@@ -2283,11 +2333,11 @@ else
{
if(FLASH_SYNC_1Hz)
{
BD83790A |= BD8379_D10;//驻车制动
BD83790A |= BD8379_D10;//פ���ƶ�
}
else
{
BD83790A &= ~BD8379_D10;//驻车制动
BD83790A &= ~BD8379_D10;//פ���ƶ�
}
Sound_Request(SND_Break_down,1);
if(Break_nodown_Count<=60)
......@@ -2318,7 +2368,7 @@ else
}
}
}
BD83790A &= ~BD8379_D9;//燃油液位
BD83790A &= ~BD8379_D9;//ȼ��Һλ
BD83790A &= ~BD8379_D2;
BD83790A &= ~BD8379_D3;
BD83790A &= ~BD8379_D4;
......@@ -2338,17 +2388,18 @@ else
BD83790B &= ~BD8379_D11;
Sound_Delete(SND_SEATBELT_SPEED); //安全带声音关闭
Sound_Delete(SND_PTO); //PTO报警音关闭
Sound_Delete(SND_LOW_FUEL_SPEED); //燃油液位低报警音关闭
Sound_Delete(SND_OVER_SPEED); //超速
Sound_Delete(SND_SEATBELT_SPEED); //��ȫ�������ر�
Sound_Delete(SND_PTO); //PTO�������ر�
Sound_Delete(SND_LOW_FUEL_SPEED); //ȼ��Һλ�ͱ������ر�
Sound_Delete(SND_OVER_SPEED); //����
Sound_Delete(SND_AEB);
}
else if( SYS_SELF_TEST_DISP_MODE ) //自检
else if( SYS_SELF_TEST_DISP_MODE ) //�Լ�
{
Sound_Delete(SND_LockWithKeyInCar);
BD83790A = 0xFFFF0000;
BD83790B = 0xFFFF0000;
BD83790B &= ~BD8379_D4;
// OldBD83790A = 0xFFFF0000;
// OldBD83790B = 0xFFFF0000;
// DB8379_WriteData(OldBD83790A, OldBD83790B);
......@@ -2356,6 +2407,7 @@ else
LED_LEFT_WHITE = 0 ;
//TelltaleLCDFlag.Telltale =0xFFFFFFFF;
TelltaleLCDFlag.Sig.LCD24 = 1;
}
else
......
code/Sources/Device/inc/YvcConfig.h
View file @ 9663cfa0
......@@ -57,7 +57,7 @@
********************************************************************************************/
/*--- Host Controlled Layer area setting ---*/
#define YVC_LYR_ADDR_CPU (0x0000U) /* Host Controlled Layer start address */
#define YVC_LYR_NUM_CPU (82) /* Number of Host Controlled Layers */
#define YVC_LYR_NUM_CPU (85) /* Number of Host Controlled Layers */
/*--- Character Code area setting ---*/
#define YVC_TBL_PTEXT_ADDR (0x0C00U) /* Character Code area start address */
......
code/Sources/Device/src/Line_In.c
View file @ 9663cfa0
......@@ -455,7 +455,7 @@ void Line_In_Debounce_Service(void)
LineInBREAKFLUIDDeb.Timer++;
if (LineInBREAKFLUIDDeb.Timer >= LINE_IN_DEBOUNCE_L_CNT)
{
LineInBREAKFLUIDDeb.Timer = 0;
LineInBREAKFLUIDDeb.Timer = 0;
LINE_IN_BREAK_FLUID_SIGNAL = LineStatus;
}
}
......
code/Sources/Driver/src/MSCAN0.c
View file @ 9663cfa0
......@@ -152,7 +152,7 @@ void MSCAN0_L_Data_Service(void)
uint8_t Priority = 0;
static uint32_t temp = 0;
if((MSCAN0TxBuf.TxHead != MSCAN0TxBuf.TxTail) && (TpTimingCtrl.Cnt - temp >= 20))
if ((MSCAN0TxBuf.TxHead != MSCAN0TxBuf.TxTail) && (TpTimingCtrl.Cnt - temp >= 20))
{
BufSel = 0x01;
BufSel <<= MSCAN0TxBuf.TxBuf[MSCAN0TxBuf.TxHead].Priority;
......
code/Sources/Implementation/inc/Sound_List.h
View file @ 9663cfa0
......@@ -4,7 +4,7 @@
#include "Sound_Source.h"
#define SND_TOTAL_NUMBER 31
#define SND_TOTAL_NUMBER 32
/******************************************************************************
声音列表
......@@ -42,6 +42,7 @@ enum SoundName
SND_OVER_SPEED ,
SND_AEB ,
SND_Break_down ,
SND_CNG_GasLeak ,
};
/******************************************************************************
......@@ -98,13 +99,14 @@ static const SoundAttributeStruct SoundList[] =
{ /* SND_PPARK_SPEED 21*/ SND_PPARK_SPEED1 , SND_TYPE_NORMAL,},
{ /* SND_DOOR_OPENED 22*/ SND_DOOR_OPENED1 , SND_TYPE_NORMAL,},
{ /* SND_PTO 23*/ SND_PTO1 , SND_TYPE_NORMAL,},
{ /* SND_noKeyInCar 24*/ SND_noKeyInCar1 , SND_TYPE_NORMAL,},
{ /* SND_POffWithoutN 25*/ SND_POffWithoutN1 , SND_TYPE_NORMAL,},
{ /* SND_LockWithKeyInCar 26*/ SND_LockWithKeyInCar1 , SND_TYPE_NORMAL,},
{ /* SND_BreakPressure 27*/ SND_BreakPressure1 , SND_TYPE_NORMAL,},
{ /* SND_OVER_SPEED 28*/ SND_OVER_SPEED1 , SND_TYPE_NORMAL,},
{ /* SND_OVER_SPEED 29*/ SND_SRC_AEB , SND_TYPE_NORMAL,},
{ /* SND_Break_down 30*/ SND_SRC_Break_down , SND_TYPE_NORMAL,},
{ /* SND_noKeyInCar 24*/ SND_noKeyInCar1 , SND_TYPE_NORMAL,},
{ /* SND_POffWithoutN 25*/ SND_POffWithoutN1 , SND_TYPE_NORMAL,},
{ /* SND_LockWithKeyInCar 26*/ SND_LockWithKeyInCar1 , SND_TYPE_NORMAL,},
{ /* SND_BreakPressure 27*/ SND_BreakPressure1 , SND_TYPE_NORMAL,},
{ /* SND_OVER_SPEED 28*/ SND_OVER_SPEED1 , SND_TYPE_NORMAL,},
{ /* SND_OVER_SPEED 29*/ SND_SRC_AEB , SND_TYPE_NORMAL,},
{ /* SND_Break_down 30*/ SND_SRC_Break_down , SND_TYPE_NORMAL,},
{ /* SND_CNG_GasLeak 31*/ SND_SRC_CNG_GasLeak , SND_TYPE_NORMAL,},
/*====================================================================================*/
};
......
code/Sources/Implementation/src/Data_Processor.c
View file @ 9663cfa0
......@@ -1945,10 +1945,12 @@ if(NVM_CONFIG_KANG==0)
******************************************************************************/
void Data_Coolant_ADblue_Processing_Service(void)
{
uint16_t Temp=0;
uint8_t Step;
if ( (Aftrtrtmnt1SCRCatalystTankLevel >=0xFF) ||(AT1T1L_STATUS & CAN_MSG_LOST)||(IO_DISP_TEST_OFF_TIME <= 20))
{
uint16_t Temp = 0;
uint8_t Step;
Temp = EMS_CylinderPressure;
if ((Temp > 64255) || (EMS_51C_STATUS & CAN_MSG_LOST) || (IO_DISP_TEST_OFF_TIME <= 20))
{
if (DataCoolantADblueCalc.LostTimer < 17) //250
{
if (DataCollantADblueValid)
......@@ -1969,22 +1971,73 @@ void Data_Coolant_ADblue_Processing_Service(void)
DataCollantADblueValid = 0;
DataCoolantADblue = 0;
}
}
else
{
Temp = Aftrtrtmnt1SCRCatalystTankLevel;
Temp = Temp*2/5; //精度 0.4
if(Temp>=100)
if (Temp <= 2000)
{
Temp = 0;
}
else if (Temp <= 3500)
{
Temp = (Temp - 2000) / 125;
}
else if (Temp <= 7100)
{
Temp = 12 + (Temp - 3500) / 300;
}
else if (Temp < 7500)
{
Temp = 24;
}
else if (Temp < 8000)
{
Temp = 25;
}
else if (Temp <= 11220)
{
Temp = 26 + (Temp - 8000) / 140;
}
else if (Temp < 11500)
{
Temp = 49;
}
else if (Temp < 12000)
{
Temp = 50;
}
else if (Temp <= 15220)
{
Temp = 51 + (Temp - 12000) / 140;
}
else if (Temp < 15500)
{
Temp = 74;
}
else if (Temp < 16000)
{
Temp = 76;
}
else if (Temp <= 18760)
{
Temp = 76 + (Temp - 16000) / 120;
}
else if (Temp < 19000)
{
Temp = 99;
}
else
{
Temp = 100 ;
}
DataCoolantADblue = Temp;
DataCollantADblueValid = 1;
DataCoolantADblueCalc.LostTimer = 0;
}
DataCoolantADblueCalc.Prescaler++;
if (DataCoolantADblueCalc.Prescaler >= 5)
{
DataCoolantADblueCalc.Prescaler = 0;
......@@ -2000,11 +2053,9 @@ void Data_Coolant_ADblue_Processing_Service(void)
case DATA_COOLANT_ADBLUE_STATE_INIT : if (DataCollantADblueValid)
{
DataCoolantADblueCalc.OutputEnable = 1;
DataCoolantADblueCalc.FastMode = 1;
DataCoolantADblueCalc.State = DATA_COOLANT_ADBLUE_STATE_FAST;
DataCoolantADblueCalc.OutputEnable = 1;
DataCoolantADblueCalc.FastMode = 1;
DataCoolantADblueCalc.State = DATA_COOLANT_ADBLUE_STATE_FAST;
}
else
{
......@@ -2069,63 +2120,60 @@ void Data_Coolant_ADblue_Processing_Service(void)
//第3步：显示输出
if (DataCoolantADblueCalc.OutputEnable)
{
if ( (DataCoolantADblue < 21 ) && (DataCoolantADblue > 19 ) )
DataCoolantADblue = 20 ;
//if ( (DataCoolantADblue < 21 ) && (DataCoolantADblue > 19 ) )
// DataCoolantADblue = 20 ;
if ( DataCoolantADblueSegDisp < DataCoolantADblue )
{
if (DataCoolantADblueCalc.FastMode)
{
DataCoolantADblueSegDisp = DataCoolantADblue ;
DataCoolantADblueSegDisp = DataCoolantADblue ;
}
else
{
Step = 5;
DataCoolantADblueCalc.DispTimer++;
if (DataCoolantADblueCalc.DispTimer >= Step)
{
DataCoolantADblueCalc.DispTimer = 0;
DataCoolantADblueSegDisp++;
}
Step = 5;
DataCoolantADblueCalc.DispTimer++;
if (DataCoolantADblueCalc.DispTimer >= Step)
{
DataCoolantADblueCalc.DispTimer = 0;
DataCoolantADblueSegDisp++;
}
}
if( DataCoolantADblueSegDisp == DataCoolantADblue )
DataCoolantADblueCalc.FastMode = 0 ;
if ( DataCoolantADblueSegDisp == DataCoolantADblue )
DataCoolantADblueCalc.FastMode = 0 ;
}
else if ( DataCoolantADblueSegDisp > DataCoolantADblue )
{
if (DataCoolantADblueCalc.FastMode)
{
DataCoolantADblueSegDisp = DataCoolantADblue ;
DataCoolantADblueSegDisp = DataCoolantADblue ;
if( (DataCoolantADblue < 21) && (DataCoolantADblue > 19 ) )
DataCoolantADblueSegDisp = 20 ;
//if ( (DataCoolantADblue < 21) && (DataCoolantADblue > 19 ) )
// DataCoolantADblueSegDisp = 20 ;
}
else
{
Step = 5;
DataCoolantADblueCalc.DispTimer++;
if (DataCoolantADblueCalc.DispTimer >= Step)
{
DataCoolantADblueCalc.DispTimer = 0;
Step = 5;
DataCoolantADblueCalc.DispTimer++;
if (DataCoolantADblueCalc.DispTimer >= Step)
{
DataCoolantADblueCalc.DispTimer = 0;
if ( DataCoolantADblueSegDisp <= 100)
DataCoolantADblueSegDisp--;
else
DataCoolantADblueSegDisp = 100 ;
}
if( DataCoolantADblueSegDisp <= 100)
DataCoolantADblueSegDisp--;
else
DataCoolantADblueSegDisp = 100 ;
}
if( DataCoolantADblueSegDisp == DataCoolantADblue)
DataCoolantADblueCalc.FastMode = 0 ;
if( (DataCoolantADblue < 21 ) && (DataCoolantADblue > 19 ) )
DataCoolantADblueSegDisp = 20 ;
if ( DataCoolantADblueSegDisp == DataCoolantADblue)
DataCoolantADblueCalc.FastMode = 0 ;
//if ( (DataCoolantADblue < 21 ) && (DataCoolantADblue > 19 ) )
// DataCoolantADblueSegDisp = 20 ;
}
}
else
{
......@@ -2134,12 +2182,11 @@ void Data_Coolant_ADblue_Processing_Service(void)
}
//第4步：天蓝液报警判断
if (DataCoolantADblueSegDisp <= 20)
DataHiCollantADblueWarning = 1;
else if (DataCoolantADblueSegDisp > 21)
DataHiCollantADblueWarning = 0;
//if (DataCoolantADblueSegDisp <= 20)
// DataHiCollantADblueWarning = 1;
//else if (DataCoolantADblueSegDisp > 21)
// DataHiCollantADblueWarning = 0;
DataCoolantADblueCalc.Backup = DataCoolantADblue;
}
......@@ -2175,10 +2222,10 @@ void Data_IGN_Off_Timing_Service(void)
{
DataIGNOffTimer.IGNStatus = 5; //防止点火时电源抖动误清断电计时
if((IO_DISP_TEST_OFF_TIME<250)&&(!SYS_SELF_TEST_DISP_MODE)) //自检熄灭时间
if ((IO_DISP_TEST_OFF_TIME < 250) && (!SYS_SELF_TEST_DISP_MODE)) //自检熄灭时间
IO_DISP_TEST_OFF_TIME++;
if ((DataVSpeedDisp>0)&&(VEH_TIME <= 700))
if ((DataVSpeedDisp > 0) && (VEH_TIME <= 700))
VEH_TIME++;
else if (DataVSpeedDisp == 0)
VEH_TIME = 0;
......
code/Sources/Implementation/src/GUI.c
View file @ 9663cfa0
......@@ -752,15 +752,38 @@ void Telltale_LCD_Display(void)
TFT_LCD_Clear_Layer(LAYER_LED03);
//EBS EBS红灯警告 42
if(TelltaleLCDFlag.Sig.LCD04 == 1)
if (TelltaleLCDFlag.Sig.LCD04 == 1)
{
//if(EBSRedWarningSignal==1)
//TFT_LCD_Display_Sprite(LAYER_LED04, SN_zhishideng_29_png, 175, 9, 64);
//else if(ABS_EBS_AmberWarningSignal==1)
TFT_LCD_Display_Sprite(LAYER_LED04, SN_zhishideng_04_png, 175, 9, 64);
}
}
else
TFT_LCD_Clear_Layer(LAYER_LED04);
//天然气状态指示灯
if (TelltaleLCDFlag.Sig.LCD31 == 1)
{
TFT_LCD_Display_Sprite(LAYER_LED31, SN_zhishideng_32X592Y190_png, 592, 190, 64);
}
else
TFT_LCD_Clear_Layer(LAYER_LED31);
//天然气泄露指示灯
if (TelltaleLCDFlag.Sig.LCD32 == 1)
{
TFT_LCD_Display_Sprite(LAYER_LED32, SN_zhishideng_32X123Y190_png, 123, 190, 64);
}
else
TFT_LCD_Clear_Layer(LAYER_LED32);
//天然气气量低状态指示灯
if (TelltaleLCD_Flag33 == 1)
{
TFT_LCD_Display_Sprite(LAYER_LED33, SN_zhishideng_31X592Y230_png, 592, 230, 64);
}
else
TFT_LCD_Clear_Layer(LAYER_LED33);
//制动系统故障灯 11 采用气压信号，低有效 此处为行车制动报警，制动气压或制动液位低时，该灯也要亮起
......
code/Sources/Module/inc/Sound_Source.h
View file @ 9663cfa0
......@@ -41,6 +41,7 @@
#define SND_OVER_SPEED1 0x1C //
#define SND_SRC_AEB 0x1D //转向报警
#define SND_SRC_Break_down 0x1E //
#define SND_SRC_CNG_GasLeak 0x1F //
/******************************************************************************
伪音源名称列表
******************************************************************************/
......@@ -75,40 +76,41 @@ typedef struct
******************************************************************************/
static const SndAttributeStruct SndAttributeTable[] =
{
/*================================================================================================
音源名称 | 音源序号 | 优先级 | 循环次数 | 播放模式 | 周期(ms)
------------------------------------------------------------------------------------------------*/
{/* SND_HI_COOLANT_TEMP_SPEED1 */ 0x01, 0, SND_CYCLE_NONSTOP, SND_MODE_SINGLE , 1000,},
{/* SND_HI_PRESSURE_SPEED 2 */ 0x01, 0, SND_CYCLE_NONSTOP, SND_MODE_SINGLE , 1000,},
{/* SND_CAN_ERROR_SPEED 3 */ 0x01, 0, 1, SND_MODE_SINGLE , 500,},
{/* SND_LOW_ADBLUE_SPEED 4 */ 0x01, 0, 1, SND_MODE_SINGLE , 500,},
{/* SND_ADBLUE_ERROR 5 */ 0x01, 0, 1, SND_MODE_SINGLE , 500,},
{/* SND_RADAR_1Hz 6 */ 0x02, 0, SND_CYCLE_NONSTOP, SND_MODE_SINGLE , 1000,},
{/* SND_RADAR_2Hz 7 */ 0x02, 0, SND_CYCLE_NONSTOP, SND_MODE_SINGLE , 500,},
{/* SND_RADAR_4Hz 8 */ 0x02, 0, SND_CYCLE_NONSTOP, SND_MODE_SINGLE , 250,},
{/* SND_RADAR_CONTINUOUS 9 */ 0x02, 0, SND_CYCLE_NONSTOP, SND_MODE_LOOP , 0,},
{/* SND_RADAR_SENSOR_FAILURE 10 */ 0x01, 0, 1, SND_MODE_SINGLE , 500,},
{/* SND_YOUTIPIAN_ERROR 11 */ 0x01, 0, 1, SND_MODE_SINGLE , 500,},
{/* SND_LF_HOOVES_ERROR 12 */ 0x01, 0, 1, SND_MODE_SINGLE , 500,},
{/* SND_RF_HOOVES_ERROR 13 */ 0x01, 0, 1, SND_MODE_SINGLE , 500,},
{/* SND_LR_HOOVES_ERROR 14 */ 0x01, 0, 1, SND_MODE_SINGLE , 500,},
{/* SND_RR_HOOVES_ERROR 15 */ 0x01, 0, 1, SND_MODE_SINGLE , 500,},
{/* SND_LOW_OIL_SPEED 16 */ 0x01, 0, 1, SND_MODE_SINGLE , 500,},
{/* SND_LOW_FUEL_SPEED 17 */ 0x01, 0, 1, SND_MODE_SINGLE , 1000,},
{/* SND_SRC_TICK */ 0x05, 0, 1, SND_MODE_SINGLE , 100,},
{/* SND_SRC_TOCK */ 0x06, 0, 1, SND_MODE_SINGLE , 100,},
{/* SND_SEATBELT_SPEED 20 */ 0x01, 0, 60, SND_MODE_SINGLE , 1000,},
{/* SND_LOW_PBRAKE_SPEED 21 */ 0x01, 0, SND_CYCLE_NONSTOP, SND_MODE_SINGLE , 1000,},
{/* SND_PPARK_SPEED 22 */ 0x01, 0, SND_CYCLE_NONSTOP, SND_MODE_SINGLE , 1000,},
{/* SND_DOOR_OPENED 23 */ 0x01, 0, SND_CYCLE_NONSTOP, SND_MODE_SINGLE , 1000,},
{/* SND_PTO 24 */ 0x01, 0, SND_CYCLE_NONSTOP, SND_MODE_SINGLE , 1000,},
{/* SND_noKeyInCar 25 */ 0x01, 0, SND_CYCLE_NONSTOP, SND_MODE_SINGLE , 1000,},
{/* SND_POffWithoutN 26 */ 0x01, 0, SND_CYCLE_NONSTOP, SND_MODE_SINGLE , 1000,},
{/* SND_LockWithKeyInCar 27 */ 0x01, 0, SND_CYCLE_NONSTOP, SND_MODE_SINGLE , 1000,},
{/* SND_BreakPressure 28 */ 0x01, 0, 90, SND_MODE_SINGLE , 1000,},
{/* SND_BreakPressure 29 */ 0x01, 0, 3, SND_MODE_SINGLE , 1000,},
{/* SND_BreakPressure 30 */ 0x01, 0, 30, SND_MODE_SINGLE , 1000,},
{/* SND_BreakPressure 31 */ 0x01, 0, SND_CYCLE_NONSTOP, SND_MODE_SINGLE , 1000,},
/*=================================================================================================
音源名称 |音源序号|优先级| 循环次数 | 播放模式 | 周期(ms)
-------------------------------------------------------------------------------------------------*/
{/* SND_HI_COOLANT_TEMP_SPEED1 1 */ 0x01, 0, SND_CYCLE_NONSTOP, SND_MODE_SINGLE , 1000,},
{/* SND_HI_PRESSURE_SPEED1 2 */ 0x01, 0, SND_CYCLE_NONSTOP, SND_MODE_SINGLE , 1000,},
{/* SND_CAN_ERROR_SPEED1 3 */ 0x01, 0, 1, SND_MODE_SINGLE , 500,},
{/* SND_LOW_ADBLUE_SPEED1 4 */ 0x01, 0, 1, SND_MODE_SINGLE , 500,},
{/* SND_ADBLUE_ERROR1 5 */ 0x01, 0, 1, SND_MODE_SINGLE , 500,},
{/* SND_RADAR_1Hz 6 */ 0x02, 0, SND_CYCLE_NONSTOP, SND_MODE_SINGLE , 1000,},
{/* SND_RADAR_2Hz 7 */ 0x02, 0, SND_CYCLE_NONSTOP, SND_MODE_SINGLE , 500,},
{/* SND_RADAR_4Hz 8 */ 0x02, 0, SND_CYCLE_NONSTOP, SND_MODE_SINGLE , 250,},
{/* SND_RADAR_CONTINUOUS 9 */ 0x02, 0, SND_CYCLE_NONSTOP, SND_MODE_LOOP , 0,},
{/* SND_RADAR_SENSOR_FAILURE 10 */ 0x01, 0, 1, SND_MODE_SINGLE , 500,},
{/* SND_YOUTIPIAN_ERROR1 11 */ 0x01, 0, 1, SND_MODE_SINGLE , 500,},
{/* SND_LF_HOOVES_ERROR1 12 */ 0x01, 0, 1, SND_MODE_SINGLE , 500,},
{/* SND_RF_HOOVES_ERROR1 13 */ 0x01, 0, 1, SND_MODE_SINGLE , 500,},
{/* SND_LR_HOOVES_ERROR1 14 */ 0x01, 0, 1, SND_MODE_SINGLE , 500,},
{/* SND_RR_HOOVES_ERROR1 15 */ 0x01, 0, 1, SND_MODE_SINGLE , 500,},
{/* SND_LOW_OIL_SPEED1 16 */ 0x01, 0, 1, SND_MODE_SINGLE , 500,},
{/* SND_LOW_FUEL_SPEED1 17 */ 0x01, 0, 1, SND_MODE_SINGLE , 1000,},
{/* SND_SRC_TICK */ 0x05, 0, 1, SND_MODE_SINGLE , 100,},
{/* SND_SRC_TOCK */ 0x06, 0, 1, SND_MODE_SINGLE , 100,},
{/* SND_SEATBELT_SPEED1 20 */ 0x01, 0, 60, SND_MODE_SINGLE , 1000,},
{/* SND_LOW_PBRAKE_SPEED1 21 */ 0x01, 0, SND_CYCLE_NONSTOP, SND_MODE_SINGLE , 1000,},
{/* SND_PPARK_SPEED1 22 */ 0x01, 0, SND_CYCLE_NONSTOP, SND_MODE_SINGLE , 1000,},
{/* SND_DOOR_OPENED1 23 */ 0x01, 0, SND_CYCLE_NONSTOP, SND_MODE_SINGLE , 1000,},
{/* SND_PTO1 24 */ 0x01, 0, SND_CYCLE_NONSTOP, SND_MODE_SINGLE , 1000,},
{/* SND_noKeyInCar1 25 */ 0x01, 0, SND_CYCLE_NONSTOP, SND_MODE_SINGLE , 1000,},
{/* SND_POffWithoutN1 26 */ 0x01, 0, SND_CYCLE_NONSTOP, SND_MODE_SINGLE , 1000,},
{/* SND_LockWithKeyInCar1 27 */ 0x01, 0, SND_CYCLE_NONSTOP, SND_MODE_SINGLE , 1000,},
{/* SND_BreakPressure1 28 */ 0x01, 0, 90, SND_MODE_SINGLE , 1000,},
{/* SND_OVER_SPEED1 29 */ 0x01, 0, 3, SND_MODE_SINGLE , 1000,},
{/* SND_SRC_AEB 30 */ 0x01, 0, 30, SND_MODE_SINGLE , 1000,},
{/* SND_SRC_Break_down 31 */ 0x01, 0, SND_CYCLE_NONSTOP, SND_MODE_SINGLE , 1000,},
{/* SND_SRC_CNG_GasLeak 32 */ 0x01, 0, SND_CYCLE_NONSTOP, SND_MODE_SINGLE , 1000,},
/*==============================================================================================*/
};
......
code/Sources/Module/inc/mapData.h
View file @ 9663cfa0
This source diff could not be displayed because it is too large. You can view the blob instead.
code/Sources/Module/src/Sound_Player.c
View file @ 9663cfa0
......@@ -14,9 +14,6 @@ void Sound_Player_Init ( void )
Buzzer_Start_Up();
}
uint8_t Sound_Play ( uint8_t SoundID )
{
if ( SoundPlayCtrl.VolInit ) //首次播放时初始化音量
......
code/Sources/Protocol/inc/CAN_Communication_Matrix.h
View file @ 9663cfa0
......@@ -1710,15 +1710,15 @@ typedef union
struct
{
uint8_t b00_07 : 8; //
uint8_t b10_17 : 8; //
uint8_t b20_27 : 8; //
uint8_t b30_31 : 2; //CruiseCtrlActive
uint8_t b32_37 : 6; //
uint8_t b40_47 : 8; //
uint8_t b50_57 : 8; //
uint8_t b60_64 : 5; //
uint8_t b65_67 : 3; // CruiseCtrlActive
uint8_t b70_77 : 8; // 56
uint8_t b08_15 : 8; //
uint8_t b16_23 : 8; //
uint8_t b24_25 : 2; //CruiseCtrlActive
uint8_t b26_31 : 6; //
uint8_t b32_39 : 8; //
uint8_t b40_47 : 8; //
uint8_t b48_52 : 5; //
uint8_t b53_55 : 3; // CruiseCtrlActive
uint8_t b56_63 : 8; // 56
}Sig;
} CANMsg18FEF100Union;
......@@ -1728,8 +1728,8 @@ extern volatile uint8_t CANMsg18FEF100Status;
#define CCVS 0x18FEF100
#define CCVS_STATUS CANMsg18FEF100Status
//------信号名---------------定义-----------注释-----------------起始位--长度--
#define CruiseCtrlActive_DA CANMsg18FEF100.Sig.b30_31 //巡航工作指示灯(大柴/锡柴/云内)
#define CruiseCtrlActive_FEIDA CANMsg18FEF100.Sig.b65_67 //巡航工作指示灯(康明斯/潍柴/玉柴)
#define CruiseCtrlActive_DA CANMsg18FEF100.Sig.b24_25 //巡航工作指示灯(大柴/锡柴/云内)
#define CruiseCtrlActive_FEIDA CANMsg18FEF100.Sig.b53_55 //巡航工作指示灯(康明斯/潍柴/玉柴)
static const uint8_t CANMsg18FEF100Init[8] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
......@@ -2167,8 +2167,8 @@ typedef union
uint8_t b40_47 : 8; //
uint8_t b50_57 : 8; //
uint8_t b60_67 : 8; //
uint8_t b70_77 : 8; //
}Sig;
uint8_t b70_77 : 8; //
} Sig;
} CANMsg1CFFBE18Union;
extern volatile CANMsg1CFFBE18Union CANMsg1CFFBE18;
......@@ -2183,6 +2183,104 @@ extern volatile uint8_t CANMsg1CFFBE18Status;
static const uint8_t CANMsg1CFFBE18Init[8] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
static const uint8_t CANMsg1CFFBE18Timeout[8] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
static const uint8_t CANMsg1CFFBE18Mask[8] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
/******************************************************************************
EMS_55E
ID:0x18FED800
******************************************************************************/
typedef union
{
uint8_t Msg[8];
struct
{
uint8_t b00_01 : 2; // EMS_CNGLampStatus
uint8_t b02_07 : 6; //
uint8_t b08_15 : 8; //
uint8_t b16_23 : 8; //
uint8_t b24_31 : 8; //
uint8_t b32_39 : 8; //
uint8_t b40_47 : 8; //
uint8_t b48_55 : 8; //
uint8_t b56_63 : 8; //
}Sig;
} CANMsg18FED800Union;
extern volatile CANMsg18FED800Union CANMsg18FED800;
extern volatile uint8_t CANMsg18FED800Status;
#define EMS_55E 0x18FED800
#define EMS_55E_STATUS CANMsg18FED800Status
//------信号名---------------定义-----------注释-----------------起始位--长度--
#define EMS_CNGLampStatus (CANMsg18FED800.Sig.b00_01)
static const uint8_t CANMsg18FED800Init[8] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
static const uint8_t CANMsg18FED800Timeout[8] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
static const uint8_t CANMsg18FED800Mask[8] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
/******************************************************************************
EMS_35D
ID:0x18FFC800
******************************************************************************/
typedef union
{
uint8_t Msg[8];
struct
{
uint8_t b00_05 : 6; // EMS_GasLeakIndicator
uint8_t b06_07 : 2; //
uint8_t b08_15 : 8; //
uint8_t b16_23 : 8; //
uint8_t b24_31 : 8; //
uint8_t b32_39 : 8; //
uint8_t b40_47 : 8; //
uint8_t b48_55 : 8; //
uint8_t b56_63 : 8; //
}Sig;
} CANMsg18FFC800Union;
extern volatile CANMsg18FFC800Union CANMsg18FFC800;
extern volatile uint8_t CANMsg18FFC800Status;
#define EMS_35D 0x18FFC800
#define EMS_35D_STATUS CANMsg18FFC800Status
//------信号名---------------定义-----------注释-----------------起始位--长度--
#define EMS_GasLeakIndicator (CANMsg18FFC800.Sig.b00_05)
static const uint8_t CANMsg18FFC800Init[8] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
static const uint8_t CANMsg18FFC800Timeout[8] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
static const uint8_t CANMsg18FFC800Mask[8] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
/******************************************************************************
EMS_51C
ID:0x18FEC600
******************************************************************************/
typedef union
{
uint8_t Msg[8];
struct
{
uint8_t b00_07 : 8; //
uint8_t b08_15 : 8; //
uint8_t b16_23 : 8; // EMS_CylinderPressure_L
uint8_t b24_31 : 8; // EMS_CylinderPressure_H
uint8_t b32_39 : 8; //
uint8_t b40_47 : 8; //
uint8_t b48_55 : 8; //
uint8_t b56_63 : 8; //
}Sig;
} CANMsg18FEC600Union;
extern volatile CANMsg18FEC600Union CANMsg18FEC600;
extern volatile uint8_t CANMsg18FEC600Status;
#define EMS_51C 0x18FEC600
#define EMS_51C_STATUS CANMsg18FEC600Status
//------信号名---------------定义-----------注释-----------------起始位--长度--
#define EMS_CylinderPressure ((uint16_t)CANMsg18FEC600.Sig.b24_31 << 8 | CANMsg18FEC600.Sig.b16_23)
static const uint8_t CANMsg18FEC600Init[8] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
static const uint8_t CANMsg18FEC600Timeout[8] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
static const uint8_t CANMsg18FEC600Mask[8] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
/*****************************************************************************************************************************************************************************
报文属性预定义
*****************************************************************************************************************************************************************************/
......@@ -2251,14 +2349,14 @@ static const CANMsgAttrStruct CANMsgAttrTable[] =
{ NWM_ICM, CANMsg18FEF717.Msg, 8, 8, CAN_MSG_Tx, CAN_MSG_CYCLE, 1000, 0, &CANMsg18FEF717Status, CANMsg18FEF717Init, CANMsg18FEF717Timeout, CANMsg18FEF717Mask,},
{ TCO1, CANMsg18FE6CEE.Msg, 8, 8, CAN_MSG_Tx, CAN_MSG_CYCLE, 50, 3, &CANMsg18FE6CEEStatus, CANMsg18FE6CEEInit, CANMsg18FE6CEETimeout, CANMsg18FE6CEEMask,},
{ VDHR, CANMsg18FEC117.Msg, 8, 8, CAN_MSG_Tx, CAN_MSG_CYCLE, 1000, 11, &CANMsg18FEC117Status, CANMsg18FEC117Init, CANMsg18FEC117Timeout, CANMsg18FEC117Mask,},
{ AIR1, CANMsg18FEAE17.Msg, 8, 8, CAN_MSG_Tx, CAN_MSG_CYCLE, 1000, 13, &CANMsg18FEAE17Status, CANMsg18FEAE17Init, CANMsg18FEAE17Timeout, CANMsg18FEAE17Mask,},
{ VDHR, CANMsg18FEC117.Msg, 8, 8, CAN_MSG_Tx, CAN_MSG_CYCLE, 1000, 11, &CANMsg18FEC117Status, CANMsg18FEC117Init, CANMsg18FEC117Timeout, CANMsg18FEC117Mask,},
{ AIR1, CANMsg18FEAE17.Msg, 8, 8, CAN_MSG_Tx, CAN_MSG_CYCLE, 1000, 13, &CANMsg18FEAE17Status, CANMsg18FEAE17Init, CANMsg18FEAE17Timeout, CANMsg18FEAE17Mask,},
//{ PGNRQ, CANMsg18EA0021.Msg, 8, 8, CAN_MSG_Tx, CAN_MSG_CYCLE, 3000, 0, &CANMsg18EA0021Status, CANMsg18EA0021Init, CANMsg18EA0021Timeout, CANMsg18EA0021Mask,},
//{ NWM_ICM, CANMsg18FEF717.Msg, 8, 8, CAN_MSG_Tx, CAN_MSG_CYCLE, 1000, 0, &CANMsg18FEF717Status, CANMsg18FEF717Init, CANMsg18FEF717Timeout, CANMsg18FEF717Mask,},
{ ETCS, CANMsg18FEC317.Msg, 8, 8, CAN_MSG_Tx, CAN_MSG_CYCLE, 100, 7, &CANMsg18FEC317Status, CANMsg18FEC317Init, CANMsg18FEC317Timeout, CANMsg18FEC317Mask,},
{ ICM_1, CANMsg18FE8E17.Msg, 8, 8, CAN_MSG_Tx, CAN_MSG_CYCLE, 1000, 17, &CANMsg18FE8E17Status, CANMsg18FE8E17Init, CANMsg18FE8E17Timeout, CANMsg18FE8E17Mask,},
{ ICM_1, CANMsg18FE8E17.Msg, 8, 8, CAN_MSG_Tx, CAN_MSG_CYCLE, 1000, 17, &CANMsg18FE8E17Status, CANMsg18FE8E17Init, CANMsg18FE8E17Timeout, CANMsg18FE8E17Mask,},
{ ICM_2, CANMsg18FEF117.Msg, 8, 8, CAN_MSG_Tx, CAN_MSG_CYCLE, 100, 3, &CANMsg18FEF117Status, CANMsg18FEF117Init, CANMsg18FEF117Timeout, CANMsg18FEF117Mask,},
{ ICM_3, CANMsg18FF0A17.Msg, 8, 8, CAN_MSG_Tx, CAN_MSG_CYCLE, 100, 11, &CANMsg18FF0A17Status, CANMsg18FF0A17Init, CANMsg18FF0A17Timeout, CANMsg18FF0A17Mask,},
{ ICM_3, CANMsg18FF0A17.Msg, 8, 8, CAN_MSG_Tx, CAN_MSG_CYCLE, 100, 11, &CANMsg18FF0A17Status, CANMsg18FF0A17Init, CANMsg18FF0A17Timeout, CANMsg18FF0A17Mask,},
{ NWM_TBOX, CANMsg18EFCD27.Msg, 8, 8, CAN_MSG_Rx, CAN_MSG_CYCLE, 10000, 0, &CANMsg18EFCD27Status, CANMsg18EFCD27Init, CANMsg18EFCD27Timeout, CANMsg18EFCD27Mask,},
{ ADAS_1, CANMsg10F007E8.Msg, 8, 8, CAN_MSG_Rx, CAN_MSG_CYCLE, 2000, 0, &CANMsg10F007E8Status, CANMsg10F007E8Init, CANMsg10F007E8Timeout, CANMsg10F007E8Mask,},
......@@ -2268,7 +2366,7 @@ static const CANMsgAttrStruct CANMsgAttrTable[] =
{ EFLP1, CANMsg18FEEF00.Msg, 8, 8, CAN_MSG_Rx, CAN_MSG_CYCLE, 5000, 0, &CANMsg18FEEF00Status, CANMsg18FEEF00Init, CANMsg18FEEF00Timeout, CANMsg18FEEF00Mask,},
{ AT1T1L, CANMsg18FE5600.Msg, 8, 8, CAN_MSG_Rx, CAN_MSG_CYCLE, 10000, 0, &CANMsg18FE5600Status, CANMsg18FE5600Init, CANMsg18FE5600Timeout, CANMsg18FE5600Mask,},
//{ OI, CANMsg18FEFF00.Msg, 8, 8, CAN_MSG_Rx, CAN_MSG_CYCLE, 100000, 0, &CANMsg18FEFF00Status, CANMsg18FEFF00Init, CANMsg18FEFF00Timeout, CANMsg18FEFF00Mask,},
//{ WFI_XI, CANMsg18FEFF17.Msg, 8, 8, CAN_MSG_Rx, CAN_MSG_CYCLE, 20000, 0, &CANMsg18FEFF17Status, CANMsg18FEFF17Init, CANMsg18FEFF17Timeout, CANMsg18FEFF17Mask,},
//{ WFI_XI, CANMsg18FEFF17.Msg, 8, 8, CAN_MSG_Rx, CAN_MSG_CYCLE, 20000, 0, &CANMsg18FEFF17Status, CANMsg18FEFF17Init, CANMsg18FEFF17Timeout, CANMsg18FEFF17Mask,},
{ SHUTDN, CANMsg18FEE400.Msg, 8, 8, CAN_MSG_Rx, CAN_MSG_CYCLE, 10000, 0, &CANMsg18FEE400Status, CANMsg18FEE400Init, CANMsg18FEE400Timeout, CANMsg18FEE400Mask,},
{ WFI_DA, CANMsg18FF7400.Msg, 8, 8, CAN_MSG_Rx, CAN_MSG_CYCLE, 10000, 0, &CANMsg18FF7400Status, CANMsg18FF7400Init, CANMsg18FF7400Timeout, CANMsg18FF7400Mask,},
{ WFI, CANMsg18FEFF00.Msg, 8, 8, CAN_MSG_Rx, CAN_MSG_CYCLE, 30000, 0, &CANMsg18FEFF00Status, CANMsg18FEFF00Init, CANMsg18FEFF00Timeout, CANMsg18FEFF00Mask,},
......@@ -2295,13 +2393,16 @@ static const CANMsgAttrStruct CANMsgAttrTable[] =
{ EEPBS1, CANMsg18FE1264.Msg, 8, 8, CAN_MSG_Rx, CAN_MSG_CYCLE, 1000, 0, &CANMsg18FE1264Status, CANMsg18FE1264Init, CANMsg18FE1264Timeout, CANMsg18FE1264Mask,},
//{ EEPB_DM1, CANMsg18FECA64.Msg, 8, 8, CAN_MSG_Rx, CAN_MSG_CYCLE, 10000, 0, &CANMsg18FECA64Status, CANMsg18FECA64Init, CANMsg18FECA64Timeout, CANMsg18FECA64Mask,},
{ EPS_Status, CANMsg18FF0113.Msg, 8, 8, CAN_MSG_Rx, CAN_MSG_CYCLE, 2000, 0, &CANMsg18FF0113Status, CANMsg18FF0113Init, CANMsg18FF0113Timeout, CANMsg18FF0113Mask,},
{ EGSM_1, CANMsg1802BFD0.Msg, 8, 8, CAN_MSG_Rx, CAN_MSG_CYCLE, 2000, 0, &CANMsg1802BFD0Status, CANMsg1802BFD0Init, CANMsg1802BFD0Timeout, CANMsg1802BFD0Mask,},
{ AMB, CANMsg18FEF500.Msg, 8, 8, CAN_MSG_Rx, CAN_MSG_CYCLE, 10000, 0, &CANMsg18FEF500Status, CANMsg18FEF500Init, CANMsg18FEF500Timeout, CANMsg18FEF500Mask,},
{ GPS_SYSTime, CANMsg18FEE6EE.Msg, 8, 8, CAN_MSG_Rx, CAN_MSG_CYCLE, 3000, 0, &CANMsg18FEE6EEStatus, CANMsg18FEE6EEInit, CANMsg18FEE6EETimeout, CANMsg18FEE6EEMask,},
{ T_BOX_RVM, CANMsg1CFFBE18.Msg, 8, 8, CAN_MSG_Rx, CAN_MSG_CYCLE, 10000, 0, &CANMsg1CFFBE18Status, CANMsg1CFFBE18Init, CANMsg1CFFBE18Timeout, CANMsg1CFFBE18Mask,},
{ EGSM_1, CANMsg1802BFD0.Msg, 8, 8, CAN_MSG_Rx, CAN_MSG_CYCLE, 2000, 0, &CANMsg1802BFD0Status, CANMsg1802BFD0Init, CANMsg1802BFD0Timeout, CANMsg1802BFD0Mask,},
{ AMB, CANMsg18FEF500.Msg, 8, 8, CAN_MSG_Rx, CAN_MSG_CYCLE, 10000, 0, &CANMsg18FEF500Status, CANMsg18FEF500Init, CANMsg18FEF500Timeout, CANMsg18FEF500Mask,},
{ GPS_SYSTime, CANMsg18FEE6EE.Msg, 8, 8, CAN_MSG_Rx, CAN_MSG_CYCLE, 3000, 0, &CANMsg18FEE6EEStatus, CANMsg18FEE6EEInit, CANMsg18FEE6EETimeout, CANMsg18FEE6EEMask,},
{ T_BOX_RVM, CANMsg1CFFBE18.Msg, 8, 8, CAN_MSG_Rx, CAN_MSG_CYCLE, 10000, 0, &CANMsg1CFFBE18Status, CANMsg1CFFBE18Init, CANMsg1CFFBE18Timeout, CANMsg1CFFBE18Mask,},
{ EMS_55E, CANMsg18FED800.Msg, 8, 8, CAN_MSG_Rx, CAN_MSG_CYCLE, 10000, 0, &CANMsg18FED800Status, CANMsg18FED800Init, CANMsg18FED800Timeout, CANMsg18FED800Mask,},
{ EMS_35D, CANMsg18FFC800.Msg, 8, 8, CAN_MSG_Rx, CAN_MSG_CYCLE, 1000, 0, &CANMsg18FFC800Status, CANMsg18FFC800Init, CANMsg18FFC800Timeout, CANMsg18FFC800Mask,},
{ EMS_51C, CANMsg18FEC600.Msg, 8, 8, CAN_MSG_Rx, CAN_MSG_CYCLE, 5000, 0, &CANMsg18FEC600Status, CANMsg18FEC600Init, CANMsg18FEC600Timeout, CANMsg18FEC600Mask,},
/*==========================================================================================================================================================================*/
};
#define CAN_TX_MSG_NUM 8
#define CAN_RX_MSG_NUM 39
#define CAN_RX_MSG_NUM 42
#endif
code/Sources/Protocol/src/CAN_Communication_Matrix.c
View file @ 9663cfa0
......@@ -213,3 +213,15 @@ volatile uint8_t CANMsg18FEE6EEStatus;
//0x1CFFBE18
volatile CANMsg1CFFBE18Union CANMsg1CFFBE18;
volatile uint8_t CANMsg1CFFBE18Status;
//0x18FED800
volatile CANMsg18FED800Union CANMsg18FED800;
volatile uint8_t CANMsg18FED800Status;
//0x18FFC800
volatile CANMsg18FFC800Union CANMsg18FFC800;
volatile uint8_t CANMsg18FFC800Status;
//0x18FEC600
volatile CANMsg18FEC600Union CANMsg18FEC600;
volatile uint8_t CANMsg18FEC600Status;
code/Sources/System/src/PowerManagement.c
View file @ 9663cfa0
......@@ -653,7 +653,8 @@ void Power_Wake_Up_Init ( void )
Com_RxStart();
Com_TxStart();
PositionLightSts_Count=0;
DriveDoorSts_Count=0;
DriveDoorSts_Count=0;
TelltaleLCD_Flag33 = 0;
}
void Com_RxStart ( void )
{
......
code/Sources/System/src/main.c
View file @ 9663cfa0
......@@ -9,6 +9,7 @@
//20210422 修改完友达屏时序
//20210621 修改软硬件版本号
//20220115 变更TFT背光频率(61194芯片换成9967芯片)
//20231114 TYW-2023-0695变更：增加天然气报警灯、天蓝液表改为天然气表
#include "main.h"
#include "fuelconfig.h"
......
code/TBDML.ini
View file @ 9663cfa0
......@@ -11,7 +11,7 @@ Layout=C_layout.hwl
LoadDialogOptions=AUTOERASEANDFLASH RUNANDSTOPAFTERLOAD="main"
CPU=HC12
AEFWarningDialog=FALSE
MainFrame=2,3,-1,-1,-1,-1,382,131,1859,919
MainFrame=2,3,-32000,-32000,-1,-1,382,131,1859,919
TOOLBAR=57600 57601 32795 0 57635 57634 57637 0 57671 57669 0 32777 32776 32782 32780 32781 32778 0 32806
Configuration=TBDML.hwc
Statusbar=1
......@@ -47,7 +47,7 @@ S12XSDBG_TRIGGER_C=RangeAllowed:1 AccessSizeCompareAllowed:0 Disabled:0 BreakAll
S12XSDBG_TRIGGER_D=RangeAllowed:0 AccessSizeCompareAllowed:1 Disabled:0 BreakAllways:0 Range:0 OutsideRange:0 CompareMismatch:0 DataToCompare:0 DataToCompareMask:0 AccessSizeCompare: 0 WordAccessSizeCompare:0
DBG_S12XS_2=DBG PREDEFINED DBGENGINE TRACE HCS12X RECORDBEFORE PUREPC
DBG_S12XS_3=DBG PREDEFINED DBGENGINE SEQUENCER 0x02 0x02 0x02
NV_PARAMETER_FILE=D:\Program Files (x86)\Freescale\CWS12v5.1\prog\FPP\mcu01C9.fpp
NV_PARAMETER_FILE=C:\Program Files (x86)\Freescale\CWS12v5.1\prog\FPP\mcu01C9.fpp
NV_SAVE_WSP=0
NV_AUTO_ID=1
COMDEVICE=SETCOMM COMPORT LPT "TBDML #1"
......@@ -110,11 +110,11 @@ Search15=DoCAN_Receive_And_Assemble_N_USData
[Recent Applications File List]
File0=C:\Users\可乐\Desktop\31五征A901变更燃油续航及BUG_20210125更改短路 燃油电压\31五征A901变更燃油续航及BUG_20210125\03_五征A901 程序源码\W3_A901_SVa00.06_20210224_FV0.06HV0.02-12V\bin\WuZhengProject7.0.abs
File1=C:\Users\可乐\Desktop\五征DY09 A901短路燃油阻值测试版\A901WuZhengProject7.0.abs.s19
File2=C:\Users\可乐\Desktop\31五征A901变更燃油续航及BUG_20210125更改短路 燃油电压\31五征A901变更燃油续航及BUG_20210125\03_五征A901 程序源码\W3_A901_SVa00.06_20210204_FV0.06HV0.02-12V\bin\WuZhengProject7.0.abs
File3=C:\Users\可乐\Desktop\五征DY09 A901短路燃油阻值测试版\DY09WuZhengProject7.0.abs.s19
LoadFlags0=AUTOERASEANDFLASH RUNANDSTOPAFTERLOAD="main"
File0=H:\EF01\源码\03-程序源码\wuzheng_a901-master\原程序\bin\WuZhengProject7.0.abs
File1=H:\EF01\源码\03-程序源码\wuzheng_a901-master\原程序\bin\WuZhengProject7.0.abs.s19
File2=C:\Users\可乐\Desktop\31五征A901变更燃油续航及BUG_20210125更改短路 燃油电压\31五征A901变更燃油续航及BUG_20210125\03_五征A901 程序源码\W3_A901_SVa00.06_20210224_FV0.06HV0.02-12V\bin\WuZhengProject7.0.abs
File3=C:\Users\可乐\Desktop\五征DY09 A901短路燃油阻值测试版\A901WuZhengProject7.0.abs.s19
LoadFlags0=AUTOERASEANDFLASH RUNANDSTOPAFTERLOAD="main"
LoadFlags1=AUTOERASEANDFLASH RUNANDSTOPAFTERLOAD="main"
LoadFlags2=AUTOERASEANDFLASH RUNANDSTOPAFTERLOAD="main"
LoadFlags3=AUTOERASEANDFLASH RUNANDSTOPAFTERLOAD="main"
......
code/bin/WuZhengProject7.0.abs.glo
View file @ 9663cfa0
This source diff could not be displayed because it is too large. You can view the blob instead.
code/bin/WuZhengProject7.0.abs.s19
View file @ 9663cfa0
This source diff could not be displayed because it is too large. You can view the blob instead.
code/bin/WuZhengProject7.0.map
View file @ 9663cfa0
This source diff could not be displayed because it is too large. You can view the blob instead.
code/bin/WuZhengProject7.0.xpr
View file @ 9663cfa0
Data < ADDXPR ONLY_ADD_IF_NEW "FuelResistanceV"
Data < ADDXPR ONLY_ADD_IF_NEW "hyqhyq"
Data < ADDXPR ONLY_ADD_IF_NEW "AnalogFuelSensorRes"
Data < ADDXPR ONLY_ADD_IF_NEW "NVMConfig3300.Sig.S10 "
Data < ADDXPR ONLY_ADD_IF_NEW "NVMConfig3300.Sig.S1 "
Data < ADDXPR ONLY_ADD_IF_NEW "NVMConfig3300.Sig.S26 "
Data < ADDXPR ONLY_ADD_IF_NEW "NVMConfig3300.Sig.S25 "
Data:1 < ADDXPR ONLY_ADD_IF_NEW "FuelResistanceV"
Data:1 < ADDXPR ONLY_ADD_IF_NEW "hyqhyq"
Data:1 < ADDXPR ONLY_ADD_IF_NEW "AnalogFuelSensorRes"
Data:1 < ADDXPR ONLY_ADD_IF_NEW "NVMConfig3300.Sig.S10 "
Data:1 < ADDXPR ONLY_ADD_IF_NEW "NVMConfig3300.Sig.S1 "
Data:1 < ADDXPR ONLY_ADD_IF_NEW "NVMConfig3300.Sig.S26 "
Data:1 < ADDXPR ONLY_ADD_IF_NEW "NVMConfig3300.Sig.S25 "
s19/APP_20231117190504098830.s19 deleted 100644 → 0
View file @ 8eb4fd05
This source diff could not be displayed because it is too large. You can view the blob instead.
s19/APP_20231117191725187366.s19 0 → 100644
View file @ 9663cfa0
This source diff could not be displayed because it is too large. You can view the blob instead.
s19/Merge_20231117190504115785.s19 deleted 100644 → 0
View file @ 8eb4fd05
This source diff could not be displayed because it is too large. You can view the blob instead.
s19/Merge_20231117191725207339.s19 0 → 100644
View file @ 9663cfa0
This source diff could not be displayed because it is too large. You can view the blob instead.
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