Skip to content

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

TYW-2023-0695变更为EF01

parent 8eb4fd05
Expand all Show whitespace changes
Inline Side-by-side
Showing with 13760 additions and 13337 deletions
code/Sources/Application/inc/Common.h
View file @ 9663cfa0
......@@ -85,10 +85,6 @@
#define LAYER_LED29 66 //指示灯29
#define LAYER_LED30 67 //指示灯30
//共享图层
#define LAYER_MENU01 68 //菜单层
#define LAYER_MENU02 69
......@@ -105,6 +101,10 @@
#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
This diff is collapsed.
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/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 ,
};
/******************************************************************************
......@@ -105,6 +106,7 @@ static const SoundAttributeStruct SoundList[] =
{ /* 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,9 +1945,11 @@ if(NVM_CONFIG_KANG==0)
******************************************************************************/
void Data_Coolant_ADblue_Processing_Service(void)
{
uint16_t Temp=0;
uint16_t Temp = 0;
uint8_t Step;
if ( (Aftrtrtmnt1SCRCatalystTankLevel >=0xFF) ||(AT1T1L_STATUS & CAN_MSG_LOST)||(IO_DISP_TEST_OFF_TIME <= 20))
Temp = EMS_CylinderPressure;
if ((Temp > 64255) || (EMS_51C_STATUS & CAN_MSG_LOST) || (IO_DISP_TEST_OFF_TIME <= 20))
{
if (DataCoolantADblueCalc.LostTimer < 17) //250
{
......@@ -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;
}
else
{
......@@ -2069,15 +2120,14 @@ 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 ;
}
else
{
......@@ -2088,11 +2138,10 @@ void Data_Coolant_ADblue_Processing_Service(void)
{
DataCoolantADblueCalc.DispTimer = 0;
DataCoolantADblueSegDisp++;
}
}
if( DataCoolantADblueSegDisp == DataCoolantADblue )
if ( DataCoolantADblueSegDisp == DataCoolantADblue )
DataCoolantADblueCalc.FastMode = 0 ;
}
......@@ -2102,8 +2151,8 @@ void Data_Coolant_ADblue_Processing_Service(void)
{
DataCoolantADblueSegDisp = DataCoolantADblue ;
if( (DataCoolantADblue < 21) && (DataCoolantADblue > 19 ) )
DataCoolantADblueSegDisp = 20 ;
//if ( (DataCoolantADblue < 21) && (DataCoolantADblue > 19 ) )
// DataCoolantADblueSegDisp = 20 ;
}
else
{
......@@ -2113,19 +2162,18 @@ void Data_Coolant_ADblue_Processing_Service(void)
{
DataCoolantADblueCalc.DispTimer = 0;
if( DataCoolantADblueSegDisp <= 100)
if ( DataCoolantADblueSegDisp <= 100)
DataCoolantADblueSegDisp--;
else
DataCoolantADblueSegDisp = 100 ;
}
if( DataCoolantADblueSegDisp == DataCoolantADblue)
if ( DataCoolantADblueSegDisp == DataCoolantADblue)
DataCoolantADblueCalc.FastMode = 0 ;
if( (DataCoolantADblue < 21 ) && (DataCoolantADblue > 19 ) )
DataCoolantADblueSegDisp = 20 ;
//if ( (DataCoolantADblue < 21 ) && (DataCoolantADblue > 19 ) )
// DataCoolantADblueSegDisp = 20 ;
}
}
else
{
......@@ -2134,11 +2182,10 @@ 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,7 +752,7 @@ 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);
......@@ -761,6 +761,29 @@ void Telltale_LCD_Display(void)
}
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,},
/*=================================================================================================
音源名称 |音源序号|优先级| 循环次数 | 播放模式 | 周期(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_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_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_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,},
{/* 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 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 b50_57 : 8; //
uint8_t b60_64 : 5; //
uint8_t b65_67 : 3; // CruiseCtrlActive
uint8_t b70_77 : 8; // 56
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};
......@@ -2168,7 +2168,7 @@ typedef union
uint8_t b50_57 : 8; //
uint8_t b60_67 : 8; //
uint8_t b70_77 : 8; //
}Sig;
} 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};
/*****************************************************************************************************************************************************************************
报文属性预定义
*****************************************************************************************************************************************************************************/
......@@ -2299,9 +2397,12 @@ static const CANMsgAttrStruct CANMsgAttrTable[] =
{ 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
......@@ -654,6 +654,7 @@ void Power_Wake_Up_Init ( void )
Com_TxStart();
PositionLightSts_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,10 +110,10 @@ 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
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"
......
code/bin/WuZhengProject7.0.abs.glo
View file @ 9663cfa0
This diff is collapsed.
code/bin/WuZhengProject7.0.abs.s19
View file @ 9663cfa0
This diff is collapsed.
code/bin/WuZhengProject7.0.map
View file @ 9663cfa0
This diff is collapsed.
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