Skip to content

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

五征EF01软件变更申请单20240814 - 附加：修改燃油从满到空时间+恢复U014087故障码（变更前版本应该用未屏蔽U014087故障码的）

parent e983f165
Hide whitespace changes
Inline Side-by-side
Showing with 5724 additions and 50 deletions
code/EF01.mcp
View file @ 8b282be0
......@@ -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/Telltales.c
View file @ 8b282be0
......@@ -461,7 +461,7 @@ void Telltales_Management(void)
}
else
{
if ((DataCoolantOilSegDisp < 60) && (EngOilPress < 15) /* || ((EngOilPress * 2) > 325)*/) /* 60kPa */
if ((DataCoolantOilSegDisp < 60) && (EngOilPress < 15) && ((EFLP1_STATUS & CAN_MSG_LOST) == 0) /* || ((EngOilPress * 2) > 325)*/) /* 60kPa */
{
BD83790A |= BD8379_D6;
......
code/Sources/Diagnostic/inc/UDS_ISO14229_Services.h
View file @ 8b282be0
......@@ -60,7 +60,7 @@ ReadDTCInformation
********************************************************************************/
#define ReadDTCInformation 0x19
#define cnDTCslen 6 //
#define cnDTCslen 7 //
#define U007488 0xC07488 //BUS OFF
#define U300316 0xF00316 //Internal local voltage < 16V
......@@ -75,9 +75,9 @@ ReadDTCInformation
#define cnU300316 1
#define cnU300317 2
#define cnU111087 3
//#define cnU014087 4
#define cnU012187 4
#define cnU010087 5
#define cnU014087 4
#define cnU012187 5
#define cnU010087 6
#define cnMSG521 0
#define cnMSGF0B 1
......
code/Sources/Diagnostic/src/UDS_ISO14229_Services.c
View file @ 8b282be0
......@@ -2380,7 +2380,7 @@ const uint32_t DTC_CODE_TABLE[] =
U300316,
U300317,
U111087,
//U014087,
U014087,
U012187,
U010087,
};
......@@ -2774,16 +2774,16 @@ void CanLoseDetected ( void )
ChangeDTCs_ST_PRG(cnU111087,0x00);
}
}
/*if(getMSGStatus(cnMSG521))
if(getMSGStatus(cnMSG521))
{
Record DTC
/*Record DTC*/
ChangeDTCs_ST_PRG(cnU014087,0x01);
}*/
/*else
}
else
{
ChangeDTCs_ST_PRG(cnU014087,0x00);
Recover DTC
}*/
/*Recover DTC*/
}
if(getMSGStatus(cnMSGF0B))
{
......
code/Sources/Driver/src/CRG.c
View file @ 8b282be0
......@@ -33,7 +33,7 @@ void WDT_Init(void)
//配置看门狗
wdt_reset();
COPCTL = WDT_PERIOD; //配置看门狗定时周期
//PLLCTL_PCE = 1; //看门狗在Pseudo Stop模式下持续运行
// PLLCTL_PCE = 1; //看门狗在Pseudo Stop模式下持续运行
}
/******************************************************************************
......
code/Sources/Module/inc/Non_volatile_Memorys.h
View file @ 8b282be0
......@@ -706,7 +706,7 @@ static const NVMConfig3300Union NVMDefault3300 =
故障码存储
******************************************************************************/
/*** 存储长度 ***/
#define NVM_DTC_LEN 6
#define NVM_DTC_LEN 7
/*** 结构声明 ***/
......@@ -727,6 +727,7 @@ extern NVMDTCUnion NVMDTC;
static const NVMDTCUnion NVMDefaultDTC =
{
0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00,
};
/******************************************************************************
......
code/Sources/System/src/main.c
View file @ 8b282be0
......@@ -35,6 +35,7 @@
//20240812 屏蔽EBS报警
//20240813 油压报警加油压目标值也满足条件
//20240817 增加报文掉线油压报警灯灭逻辑
#include "main.h"
#include "fuelconfig.h"
......
code/TBDML.ini
View file @ 8b282be0
......@@ -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=E:\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"
......@@ -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=CanLoseDetected
Search1=MSCAN0_L_Data_Request
Search2=Power_On_System_Init
Search3=Power_Management_Init
Search4=API_ISR
Search5=Sys_Status_Update_Service
Search6=MSCAN0_TX_ISR
Search7=Power_Wake_Up_Init
Search8=IGN_OFF_State_Keep
Search9=Power_Sleep_Init
Search10=CoCAN_Init_Mode_Tx_ISR
Search11=Popups_Management_Service
Search12=Analog_Signal_Conversion_Service
Search13=IO_Management_Service
Search14=Drive_Info_Display_Update_Service
Search15=Startup_Animation_Play_Service
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=Startup_Animation_Play_Service
[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 @ 8b282be0
1、WZ_EF01_BootApp_S0.11_FV0.08_240813.s19，完整版，适用于新生产的无程序仪表
2、WZ_EF01_UpdateApp_S0.11_F0.08_240813.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 @ 8b282be0
#new Option
#Tue Aug 13 17:05:17 CST 2024
#Sat Aug 17 15:42:09 CST 2024
IsSort=true
MergeFlashIsCompression=false
ChangeAppFilePath=
......@@ -57,7 +57,7 @@ MergeLineInXLSPath=
MergeFlashInPutFilePath=
MergeFlashIsInternal=false
MergeOutPutFilePath=H\:\\\u4E94\u5F81\\\u4E94\u5F81EF01\\\u53D8\u66F4240807\\\u5DE5\u7A0B\u6587\u4EF6
MergeAppFilePath=H\:\\\u4E94\u5F81\\\u4E94\u5F81EF01\\\u53D8\u66F4240807\\code-\u53D8\u66F4\u540E\\code\\bin\\WZ_EF01.s19
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