Merge branch 'dev' into 'release'

Dev

See merge request ty/tianying_ty100!103

Firmware/Source/Application/FaultCode/code.c

@@ -116,10 +116,10 @@ uint32_t Get_FaultCodeDtc2(void)
         DTC2 |= DTCM2 & 0xF;
     }
 
-    if (DTC2 == 0)
-    {
-        return 0XFFFF;
-    }
+    //if (DTC2 == 0)
+    //{
+    //    return 0XFFFF;
+    //}
 
     u16FaultCode = DTC2;
 

Firmware/Source/Component/PowerManagement/PowerManag_user.c

@@ -279,6 +279,19 @@ static Power_Status_em Power_Stay_Protect(void)
     static uint8_t LEDDriverCheckCount = 0U;
     /* 关闭所有外设，坪保留AD采集，电溝状思切�? */
     {
+        for(LED = 0u; LED < LampCh0_MAX; LED++)
+        {
+            LED_Driver_Channel_Set(0u, LED, 0u);
+        }
+
+        for ( i = 0; i < LED_Max; i++ )
+        {
+            Telltales_DiagCtrl(i, 0x00u);
+        }
+
+        LED_Driver_Scan_Refresh( );
+        LED_Driver_Service_Immediate();
+
         BU98R10_Shutdown( );
         TimerM_PWM_set_duty(TIMERM_COUNTER1, TIMERM_CHB, 0);
         CAN_TX_SetEnable(&CAN_CH0_CanMsgTxOp, CAN_N_TX_Disable);

Firmware/Source/System/Sys_Task_List.c

@@ -132,17 +132,17 @@ void Sys_Exact_50us_Tasks(void)
     static uint32_t task_1ms = 0u;
     static uint32_t task_100ms = 0u;
     Can_Write_Fun(&CAN_CH0_CanMsgTxOp, 50u);
-    DoCAN_Timer_Update(50u);
+        DoCAN_Timer_Update(50u);
     GenDelay_Tick();
     task_100ms++;
-    if(task_100ms >= 2000)
+    if(task_100ms >= 1996)
     {
-        task_100ms = 0u;
+                task_100ms = 0u;
         if(Get_MileageInit_Status() == 0X5AA53AA3UL)
         {
             Data_Mileage_ISR();
         }
-        
+
     }
     task_1ms++;
     if ( task_1ms >=20U )   

Firmware/Source/UDS/UDS_ISO14229_Services.h

@@ -312,10 +312,10 @@
 #define CheckSumErr       7    // Checksum Error
 #define UnknownPartID     8    // Unknown Part ID
 
-#define SWV 0x123 // 0x100 = 1.00 software version 软件版本号
+#define SWV 0x124 // 0x100 = 1.00 software version 软件版本号
 #define HWV 0x103 // 0x100 = 1.00 hardware version 硬件版本号
 #define BTV 0x100 // 0x100 = 1.00 bootloader version boot程序版本号
-#define INTLV 0x123 // 0x100 = 1.00 internal version 内部版本号
+#define INTLV 0x124 // 0x100 = 1.00 internal version 内部版本号
 #define PROG_Y 0x24 // 0x24 = 2024年, program year
 #define PROG_M 0x09 // 0x03 = 3月, program month
 #define PROG_D 0x21 // 0x19 = 19日, program day