Skip to content

W
WZ-EF01
Commit dd247fca authored by 姜凯文's avatar 姜凯文 🤒
Browse files
Options

Merge branch 'dev' into 'master' 

五征EF01软件变更申请单20240807.docx，五征EF01软件变更申请单20240812 - 附加.docx，五征EF01软件变更申请单20240814 - 附加.docx

See merge request !13
parents edca1d26 8b282be0
Hide whitespace changes
Inline Side-by-side
Showing with 5764 additions and 45 deletions
code/EF01.mcp
View file @ dd247fca
......@@ -850,7 +850,7 @@
<SETTING><NAME>Options</NAME><VALUE>-MapFLASH </VALUE></SETTING>
<SETTING><NAME>LinkParameterFilename</NAME><VALUE>out.prm</VALUE></SETTING>
<SETTING><NAME>EchoCommandLine</NAME><VALUE>0</VALUE></SETTING>
<SETTING><NAME>OutputFilename</NAME><VALUE>WuZhengProject7.0.abs</VALUE></SETTING>
<SETTING><NAME>OutputFilename</NAME><VALUE>WZ_EF01</VALUE></SETTING>
<SETTING><NAME>UseTemplate</NAME><VALUE>2</VALUE></SETTING>
<SETTING><NAME>PrmTemplateName</NAME><VALUE>mc9S12xhy256.prm</VALUE></SETTING>
<SETTING><NAME>RunPreprocessor</NAME><VALUE>0</VALUE></SETTING>
......@@ -2047,7 +2047,7 @@
</FILE>
<FILE>
<PATHTYPE>Name</PATHTYPE>
<PATH>Fuel_V3.2_DR9999.lib</PATH>
<PATH>Fuel_V3.4_30Min_DR9999.lib</PATH>
<PATHFORMAT>Windows</PATHFORMAT>
<FILEKIND>Unknown</FILEKIND>
<FILEFLAGS>Debug</FILEFLAGS>
......@@ -2801,7 +2801,7 @@
</FILEREF>
<FILEREF>
<PATHTYPE>Name</PATHTYPE>
<PATH>Fuel_V3.2_DR9999.lib</PATH>
<PATH>Fuel_V3.4_30Min_DR9999.lib</PATH>
<PATHFORMAT>Windows</PATHFORMAT>
</FILEREF>
</LINKORDER>
......@@ -2814,12 +2814,6 @@
<GROUPLIST>
<GROUP><NAME>FuelProcessor</NAME>
<FILEREF>
<TARGETNAME>Standard</TARGETNAME>
<PATHTYPE>Name</PATHTYPE>
<PATH>Fuel_V3.2_DR9999.lib</PATH>
<PATHFORMAT>Windows</PATHFORMAT>
</FILEREF>
<FILEREF>
<TARGETNAME>Standard</TARGETNAME>
<PATHTYPE>Name</PATHTYPE>
......@@ -3064,6 +3058,12 @@
</FILEREF>
</GROUP>
<GROUP><NAME>Driver</NAME>
<FILEREF>
<TARGETNAME>Standard</TARGETNAME>
<PATHTYPE>Name</PATHTYPE>
<PATH>Fuel_V3.4_30Min_DR9999.lib</PATH>
<PATHFORMAT>Windows</PATHFORMAT>
</FILEREF>
<FILEREF>
<TARGETNAME>Standard</TARGETNAME>
<PATHTYPE>Name</PATHTYPE>
......
code/Sources/Application/src/Menus.c
View file @ dd247fca
......@@ -55,7 +55,7 @@ void Menu_Processing_Service(void)
TFT_LCD_Clear_Multi_Layer(LAYER_MENU05, LAYER_MENU14);
TFT_LCD_Display_Sprite(LAYER_MENU01, SN_menu04_png, 337, 150, 64);
TFT_LCD_Display_Sprite(LAYER_MENU02, SN_menu02_png, 337, 184, 64);
TFT_LCD_Display_Sprite(LAYER_MENU03, SN_menu03_png, 337, 218, 64);
//TFT_LCD_Display_Sprite(LAYER_MENU03, SN_menu03_png, 337, 218, 64);
switch (SetMenupage)
{
......@@ -227,7 +227,7 @@ void Time_Seting(void)
keytime = 0;
IO_CAN_KEY_RIGHT = IO_KEY_IDLE;
SetMenupage++;
if (SetMenupage > 2)
if (SetMenupage > 1)
SetMenupage = 0;
}
if (IO_CAN_KEY_LEFT == IO_KEY_PRESS)
......@@ -235,7 +235,7 @@ void Time_Seting(void)
keytime = 0;
IO_CAN_KEY_LEFT = IO_KEY_IDLE;
if (SetMenupage == 0)
SetMenupage = 2;
SetMenupage = 1;
else
SetMenupage--;
}
......
code/Sources/Application/src/Telltales.c
View file @ dd247fca
......@@ -418,7 +418,7 @@ void Telltales_Management(void)
//31 ����ѹ���� EngOilPress 15
// #if ModVersion == Version_KANG
if (NVM_CONFIG_KANG > 0)
if (0)//NVM_CONFIG_KANG > 0)
{
if (EngOilPress == 0)
{
......@@ -461,9 +461,19 @@ void Telltales_Management(void)
}
else
{
if ((EngOilPress < 25) || ((EngOilPress * 2) > 325)) //��100Kpa����650Kpa
if ((DataCoolantOilSegDisp < 60) && (EngOilPress < 15) && ((EFLP1_STATUS & CAN_MSG_LOST) == 0) /* || ((EngOilPress * 2) > 325)*/) /* 60kPa */
{
BD83790A |= BD8379_D6;
if (ESpeed_300_2S_Sts)
{
Sound_Request(SND_LOW_OIL_SPEED, 1);
}
else
{
Sound_Delete(SND_LOW_OIL_SPEED);
}
if (EngOilPress_Count <= 60)
{
EngOilPress_Count++;
......@@ -489,6 +499,7 @@ void Telltales_Management(void)
}
else
{
Sound_Delete(SND_LOW_OIL_SPEED);
if ((EngOilPress_Count > 0) && (EngOilPress_Count <= 60))
{
LED_RIGHT_RED = 1;
......@@ -2371,6 +2382,7 @@ void Telltales_Management(void)
Sound_Delete(SND_LOW_FUEL_SPEED); //ȼ��Һλ�ͱ������ر�
Sound_Delete(SND_OVER_SPEED); //����
Sound_Delete(SND_AEB);
Sound_Delete(SND_LOW_OIL_SPEED);
}
else if (SYS_SELF_TEST_DISP_MODE) //�Լ�
{
......@@ -2390,12 +2402,14 @@ void Telltales_Management(void)
LowBrakeLuidLevel_timp = 0;
TelltaleLCDFlag.Sig.LCD32 = 0;
Sound_Delete(SND_CNG_GasLeak);
Sound_Delete(SND_LOW_OIL_SPEED);
}
else
{
Sound_Delete(SND_LockWithKeyInCar);
TelltaleLCDFlag.Sig.LCD32 = 0;
Sound_Delete(SND_CNG_GasLeak);
Sound_Delete(SND_LOW_OIL_SPEED);
LowBrakeLuidLevel_timp = 0;
}
......
code/Sources/Implementation/inc/Data_Processor.h
View file @ dd247fca
......@@ -32,6 +32,9 @@ extern uint16_t DataESpeedDisp;
extern uint8_t DataESpeedValid;
extern uint8_t Maintain_alarm;
extern uint8_t ESpeed_300_2S_Sts;
extern uint8_t ESpeed_300_2S_Time;
#define DATA_ENGINE_SPEED_ACTUAL DataESpeedActual
#define DATA_ENGINE_SPEED_DISPLAYING DataESpeedDisp
#define DATA_ENGINE_SPEED_VALID DataESpeedValid
......
code/Sources/Implementation/src/Data_Processor.c
View file @ dd247fca
......@@ -12,6 +12,9 @@ DataESpeedSamplerStruct DataESpeedSampler;
DataESPeedDampingStruct DataESPeedDamping;
DataESpeedIdleStruct DataESpeedIdle;
uint16_t DataFuelVolRemaining;
uint8_t ESpeed_300_2S_Time;
uint8_t ESpeed_300_2S_Sts;
/*** 车速 ***/
uint16_t DataVSpeedActual;
uint16_t DataVSpeedDisp;
......@@ -134,6 +137,8 @@ void Data_Power_On_Init(void)
DataESPeedDamping.Speed = 0;
DataESPeedDamping.Delta = 0;
DataESPeedDamping.Dir = DATA_APPR_DIR_INC;
ESpeed_300_2S_Sts = 0;
ESpeed_300_2S_Time = 0;
Fuel_Seg = 0; //燃油段数初始化
//Espeed_Seg_Disp[0] = 0;
//Espeed_Seg_Disp[1] = 0;
......@@ -523,6 +528,23 @@ void Data_Engine_Speed_Processing_Service(void)
// ESpeed = DataESpeedSampler.Backup;
//else
ESpeed = DataESpeedActual;
if (ESpeed > 300)
{
if (ESpeed_300_2S_Time < 100)
{
ESpeed_300_2S_Time++;
}
else
{
ESpeed_300_2S_Sts = 1;
}
}
else
{
ESpeed_300_2S_Time = 0;
ESpeed_300_2S_Sts = 0;
}
if ((ESpeed >= 500) && (ESpeed <= 1000)) //20200109
//if ((ESpeed >= 500) && (ESpeed <= 6000))
......
code/Sources/Implementation/src/GUI.c
View file @ dd247fca
......@@ -756,7 +756,7 @@ void Telltale_LCD_Display(void)
TFT_LCD_Clear_Layer(LAYER_LED03);
//EBS EBS红灯警告 42
if (TelltaleLCDFlag.Sig.LCD04 == 1)
if (0) //TelltaleLCDFlag.Sig.LCD04 == 1)
{
//if (EBSRedWarningSignal == 1)
// TFT_LCD_Display_Sprite(LAYER_LED04, SN_zhishideng_29_png, 175, 9, 64);
......
code/Sources/Implementation/src/IO_Manager.c
View file @ dd247fca
......@@ -192,6 +192,7 @@ void IO_Management_Service(void)
IOTFTLCDAccessRight = 0x00;
IOTFTLCDAccessRight = (IO_TIME_BIT | IO_BG_INFO_BIT);
}
#if 0
if ((IO_DRIVE_INFO_DISPLAY_ENABLE) && (!IO_POPUP_DISPLAY_ENABLE) && (IO_CAN_KEY_LEFT == IO_KEY_LONG))
{
IO_CAN_KEY_LEFT = IO_KEY_IDLE;
......@@ -199,6 +200,7 @@ void IO_Management_Service(void)
IOTFTLCDAccessRight = (IO_TIME_BIT | IO_BG_INFO_BIT);
SetMenu = 3;
}
#endif
if ((IO_DRIVE_INFO_DISPLAY_ENABLE) && (!IO_POPUP_DISPLAY_ENABLE) && (IO_CAN_KEY_RIGHT == IO_KEY_LONG))
{
IO_CAN_KEY_RIGHT = IO_KEY_IDLE;
......
code/Sources/Module/inc/Sound_Source.h
View file @ dd247fca
......@@ -93,7 +93,7 @@ static const SndAttributeStruct SndAttributeTable[] =
{/* 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_OIL_SPEED1 16 */ 0x03, 0, 10, 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,},
......
code/Sources/System/src/main.c
View file @ dd247fca
......@@ -31,6 +31,12 @@
//20240515 修改禅道QAC高危问题：42983、42982、42979
//20240522 修改禅道QAC高危问题：43378
//20240807 屏蔽行车信息显示；修改油压报警灯逻辑
//20240812 屏蔽EBS报警
//20240813 油压报警加油压目标值也满足条件
//20240817 增加报文掉线油压报警灯灭逻辑
#include "main.h"
#include "fuelconfig.h"
#include "UDS_ISO14229_Services.h"
......
code/TBDML.ini
View file @ dd247fca
......@@ -11,7 +11,7 @@ Layout=C_layout.hwl
LoadDialogOptions=AUTOERASEANDFLASH RUNANDSTOPAFTERLOAD="main"
CPU=HC12
AEFWarningDialog=FALSE
MainFrame=2,3,-1,-1,-1,-1,2158,69,3544,905
MainFrame=2,3,-32000,-32000,-1,-1,2158,69,3544,905
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=
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"
......@@ -69,7 +69,7 @@ ISRDISABLEDSTEP=1
[TBDML]
COMSETTINGS=SETCOMM DRIVER NOPROTOCOL NOPERIODICAL
NV_PARAMETER_FILE=C:\Program Files (x86)\Freescale\CWS12v5.1\prog\FPP\mcu01C9.fpp
NV_PARAMETER_FILE=
NV_SAVE_WSP=0
NV_AUTO_ID=1
......@@ -77,22 +77,22 @@ NV_AUTO_ID=1
[Recent HI-WAVE FindProcedure Search]
Search0=MSCAN0_L_Data_Request
Search1=Power_On_System_Init
Search2=Power_Management_Init
Search3=API_ISR
Search4=Sys_Status_Update_Service
Search5=MSCAN0_TX_ISR
Search6=Power_Wake_Up_Init
Search7=IGN_OFF_State_Keep
Search8=Power_Sleep_Init
Search9=CoCAN_Init_Mode_Tx_ISR
Search10=Popups_Management_Service
Search11=Analog_Signal_Conversion_Service
Search12=IO_Management_Service
Search13=Drive_Info_Display_Update_Service
Search14=Startup_Animation_Play_Service
Search15=GUI_ADAS_Display
Search0=Telltales_Management
Search1=CanLoseDetected
Search2=MSCAN0_L_Data_Request
Search3=Power_On_System_Init
Search4=Power_Management_Init
Search5=API_ISR
Search6=Sys_Status_Update_Service
Search7=MSCAN0_TX_ISR
Search8=Power_Wake_Up_Init
Search9=IGN_OFF_State_Keep
Search10=Power_Sleep_Init
Search11=CoCAN_Init_Mode_Tx_ISR
Search12=Popups_Management_Service
Search13=Analog_Signal_Conversion_Service
Search14=IO_Management_Service
Search15=Drive_Info_Display_Update_Service
......@@ -110,11 +110,11 @@ Search15=GUI_ADAS_Display
[Recent Applications File List]
File0=I:\GIT\DEV\WZ-EF01\s19\WZ_EF01_BootApp_BV1.04_SV00.10_HV1.07_FV0.08_20240315.s19
File1=H:\EF01\变更\原程序\bin\WuZhengProject7.0.abs
File2=H:\EF01\变更\新建文件夹\W3_EF01_BootApp_BV1.2_SV00.10_HV1.07_FV0.08.s19
File3=I:\GIT\DEV\WZ-EF01\s19\W3_EF01_20231206_BV1.01(500k)_SVa00.09_HV1.07_FV0.08-12V_ALL.s19
LoadFlags0=AUTOERASEANDFLASH RUNANDSTOPAFTERLOAD="main"
File0=H:\五征\五征EF01\变更240807\工程文件\WZ_EF01_BootApp_S0.11_F0.08_240817.s19
File1=H:\五征\五征EF01\变更240807\code-变更后\code\bin\WuZhengProject7.0.abs
File2=I:\GIT\DEV\WZ-EF01\s19\WZ_EF01_BootApp_BV1.04_SV00.10_HV1.07_FV0.08_20240315.s19
File3=H:\EF01\变更\原程序\bin\WuZhengProject7.0.abs
LoadFlags0=AUTOERASEANDFLASH RUNANDSTOPAFTERLOAD="main"
LoadFlags1=AUTOERASEANDFLASH RUNANDSTOPAFTERLOAD="main"
LoadFlags2=AUTOERASEANDFLASH RUNANDSTOPAFTERLOAD="main"
LoadFlags3=AUTOERASEANDFLASH RUNANDSTOPAFTERLOAD="main"
......
s19/释放软件说明.txt
View file @ dd247fca
1、WZ_EF01_BootApp_S0.11_FV0.08_240522.s19，完整版，适用于新生产的无程序仪表
2、WZ_EF01_UpdateApp_S0.11_F0.08_240522.s19，APP版，适用于烧过完整版程序仪表，需配合诊断工具使用
1、WZ_EF01_BootApp_S0.11_FV0.08_240817.s19，完整版，适用于新生产的无程序仪表
2、WZ_EF01_UpdateApp_S0.11_F0.08_240817.s19，APP版，适用于烧过完整版程序仪表，需配合诊断工具使用
utility/诊断工具1.10.11 x64/Option/Option.properties
View file @ dd247fca
#new Option
#Wed May 22 16:01:36 CST 2024
#Sat Aug 17 15:42:09 CST 2024
IsSort=true
MergeFlashIsCompression=false
ChangeAppFilePath=
......@@ -56,8 +56,8 @@ IsHexDisplay=true
MergeLineInXLSPath=
MergeFlashInPutFilePath=
MergeFlashIsInternal=false
MergeOutPutFilePath=H\:\\\u4E94\u5F81\\\u4E94\u5F81EF01\\\u53D8\u66F4\\\u65B0\u5EFA\u6587\u4EF6\u5939
MergeAppFilePath=H\:\\\u4E94\u5F81\\\u4E94\u5F81EF01\\\u53D8\u66F4\\\u539F\u7A0B\u5E8F\\bin\\WuZhengProject7.0.abs.s19
MergeOutPutFilePath=H\:\\\u4E94\u5F81\\\u4E94\u5F81EF01\\\u53D8\u66F4240807\\\u5DE5\u7A0B\u6587\u4EF6
MergeAppFilePath=H\:\\\u4E94\u5F81\\\u4E94\u5F81EF01\\\u53D8\u66F4240807\\code-\u53D8\u66F4\u540E\\bin\\WZ_EF01.s19
MergeTelltalesXLSPath=
FillingByte=-86
ImageVersion=0
......
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