Merge branch 'LBW' into 'dev'

Lbw

See merge request !12

code/Sources/Diagnostic/inc/UDS_ISO14229_Services.h

@@ -60,7 +60,7 @@ ReadDTCInformation
 ********************************************************************************/
 
 #define   ReadDTCInformation              0x19
-#define   cnDTCslen		7	//
+#define   cnDTCslen		6	//
 
 #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 5
-#define cnU010087 6
+//#define cnU014087 4
+#define cnU012187 4
+#define cnU010087 5
 
 #define cnMSG521      0
 #define cnMSGF0B      1

code/Sources/Diagnostic/src/UDS_ISO14229_Services.c

@@ -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

@@ -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

@@ -706,7 +706,7 @@ static const NVMConfig3300Union NVMDefault3300 =
 故障码存储
 ******************************************************************************/
 /*** 存储长度 ***/
-#define   NVM_DTC_LEN                       7
+#define   NVM_DTC_LEN                       6
 
 /*** 结构声明 ***/
 
@@ -727,7 +727,6 @@ extern NVMDTCUnion                      NVMDTC;
 static const NVMDTCUnion NVMDefaultDTC =
 {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 
 };
 
 /******************************************************************************

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=
+NV_PARAMETER_FILE=E:\Program Files (x86)\Freescale\CWS12v5.1\prog\FPP\mcu01C9.fpp
 NV_SAVE_WSP=0
 NV_AUTO_ID=1
 COMDEVICE=SETCOMM COMPORT LPT "TBDML #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=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