TYW-2024-0296变更

code/Sources/Diagnostic/src/UDS_ISO14229_Services.c

@@ -1626,7 +1626,7 @@ void UDS_Service_22_Indication ( uint32_t A_TA_type, uint16_t A_Length, uint8_t
           UDS_ISO14229_Transfer[ 8] = '0';
           UDS_ISO14229_Transfer[ 9] = '.';
           UDS_ISO14229_Transfer[10] = '1';
-          UDS_ISO14229_Transfer[11] = '0';
+          UDS_ISO14229_Transfer[11] = '1';
           UDS_Service_Response ( 0x22, POSITIVE_RSP, DIAG_ID_Tx, 12, UDS_ISO14229_Transfer );    
       break;
 	  case 0xF191:

code/Sources/Protocol/inc/CAN_Communication_Matrix.h

@@ -578,15 +578,15 @@ typedef union
 	{		
 		uint8_t   b00_00 	:  1;   // LowBrakeLuidLevel
 		uint8_t   b01_01 	:  1;   // SafetyBeltSt
-		uint8_t   b02_04  :  3;   // TankLevel
+		uint8_t   b02_04  :  3;   //
 		uint8_t   b05_05  :  1;   // MaintainSignal
 		uint8_t   b06_07 	:  2;   // 
 		
-		uint8_t   b10_17 	:  8;   // AverageFuelConsumption_LL
-		uint8_t   b20_27 	:  8;   // AverageFuelConsumption_LH
-		uint8_t   b30_37 	:  8;   // AverageFuelConsumption_HL
-		uint8_t   b40_47 	:  8;   // AverageFuelConsumption_HH
-		uint8_t   b50_57 	:  8;   // 
+		uint8_t   b10_17 	:  8;   //
+		uint8_t   b20_27 	:  8;   //
+		uint8_t   b30_37 	:  8;   //
+		uint8_t   b40_47 	:  8;   //
+		uint8_t   b50_57 	:  8;   // TankLevel
 		uint8_t   b60_67 	:  8;   //               
 		uint8_t   b70_77  :  8;   //  
 	} Sig; 
@@ -604,13 +604,6 @@ extern volatile uint8_t             CANMsg18FE8E17Status;
 
 #define TankLevel				          	CANMsg18FE8E17.Sig.b50_57    //  油箱液位
 #define MaintainSignal			    	  CANMsg18FE8E17.Sig.b05_05    //  保养信号
-#define AverageFuelConsumption_LL	  CANMsg18FE8E17.Sig.b10_17    //  平均油耗
-
-#define AverageFuelConsumption_LH	  CANMsg18FE8E17.Sig.b20_27    //  平均油耗
-
-#define AverageFuelConsumption_HL 	CANMsg18FE8E17.Sig.b30_37    //  平均油耗
-
-#define AverageFuelConsumption_HH	  CANMsg18FE8E17.Sig.b40_47    //  平均油耗                                                               
 
 static const uint8_t  CANMsg18FE8E17Init[8]    = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
 static const uint8_t  CANMsg18FE8E17Timeout[8] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};

code/Sources/System/src/main.c

@@ -25,6 +25,9 @@
 //20240307 修改燃油不走问题（诊断屏蔽了3300配置项）
 //20240313 取消0x18FFOA17外发（EF01报文矩阵里没有），修改30电15电同时上首帧网络管理报文外发超时问题
 //20240315 修改诊断测出问题（李秉微）
+//V00.11
+//20240446 修改车厂问题：0x18FE8E17外发不对（新报文矩阵无平均油耗输出）
+//20240430 修改软件版本号
 
 #include "main.h"
 #include "fuelconfig.h"

code/TBDML.ini

@@ -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=C:\Program Files (x86)\Freescale\CWS12v5.1\prog\FPP\mcu01C9.fpp
+NV_PARAMETER_FILE=
 NV_SAVE_WSP=0
 NV_AUTO_ID=1
 COMDEVICE=SETCOMM COMPORT LPT "TBDML #1"
@@ -110,10 +110,10 @@ Search15=GUI_ADAS_Display
 
 
 [Recent Applications File List]
-File0=H:\EF01\变更\原程序\bin\WuZhengProject7.0.abs
-File1=H:\EF01\变更\新建文件夹\W3_EF01_BootApp_BV1.2_SV00.10_HV1.07_FV0.08.s19
-File2=I:\GIT\DEV\WZ-EF01\s19\W3_EF01_20231206_BV1.01(500k)_SVa00.09_HV1.07_FV0.08-12V_ALL.s19
-File3=H:\EF01\源码\03-程序源码\wuzheng_a901-master\原程序\bin\WuZhengProject7.0.abs
+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"
 LoadFlags1=AUTOERASEANDFLASH RUNANDSTOPAFTERLOAD="main"
 LoadFlags2=AUTOERASEANDFLASH RUNANDSTOPAFTERLOAD="main"

s19/释放软件说明.txt

-1、WZ_EF01_BootApp_S0.10_FV0.08_240321.s19，完整版，适用于新生产的无程序仪表
-2、WZ_EF01_UpdateApp_S0.10_F0.08_240321.s19，APP版，适用于烧过完整版程序仪表，需配合诊断工具使用
+1、WZ_EF01_BootApp_S0.11_FV0.08_240430.s19，完整版，适用于新生产的无程序仪表
+2、WZ_EF01_UpdateApp_S0.11_F0.08_240430.s19，APP版，适用于烧过完整版程序仪表，需配合诊断工具使用

utility/诊断工具1.10.11 x64/Option/Option.properties

 #new Option
-#Fri Mar 15 19:55:18 CST 2024
+#Tue Apr 30 13:19:46 CST 2024
 IsSort=true
 MergeFlashIsCompression=false
 ChangeAppFilePath=
@@ -26,7 +26,7 @@ MergeLineInOutPutPath=
 Leave2ID=5
 PHYID=7D2
 BaudRate=500K
-AppUpdateFilePath=I\:\\GIT\\DEV\\WZ-EF01\\s19\\WZ_EF01_UpdateApp_BV1.04_SV00.10_HV1.07_FV0.08_20240315.s19
+AppUpdateFilePath=
 FUNID=7DF
 IsMergeCreateBin=false
 IsOverWrite=false
@@ -56,8 +56,8 @@ IsHexDisplay=true
 MergeLineInXLSPath=
 MergeFlashInPutFilePath=
 MergeFlashIsInternal=false
-MergeOutPutFilePath=I\:\\GIT\\DEV\\WZ-EF01\\s19
-MergeAppFilePath=I\:\\GIT\\DEV\\WZ-EF01\\code\\bin\\WuZhengProject7.0.abs.s19
+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
 MergeTelltalesXLSPath=
 FillingByte=-86
 ImageVersion=0