Merge branch 'lijianshuang' into 'dev'

Lijianshuang

See merge request !80

Firmware/Project/Cmsemicon/BAT32A239/MDK_ARM/TianYing200.BAT

 SET PATH=C:\Keil_v5\ARM\ARMCC\Bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Windows\System32\OpenSSH\;C:\Users\tyw05\AppData\Local\Microsoft\WindowsApps;
-SET ARMCC5_ASMOPT=--diag_suppress=9931
-SET ARMCC5_CCOPT=--diag_suppress=9931
-SET ARMCC5_LINKOPT=--diag_suppress=9931
 SET CPU_TYPE=BAT32G139GK64FB
 SET CPU_VENDOR=Cmsemicon
 SET UV2_TARGET=TianYing200

Firmware/Source/Application/Data_TPMS/Data_TPMS.c

@@ -405,7 +405,7 @@ void Data_TPMS_Processing_Service ( void )
                         TPMS.Front_Press_Value = 9900;
                     }
                     //if(((TPMS.Front_Press_Value + 50) < 1700) || ((TPMS.Front_Press_Value + 50) > 2300))
-                    if((Get_Front_TPMS_Sig_Value() < 17) || (Get_Front_TPMS_Sig_Value() > 25))
+                    if((Get_Front_TPMS_Sig_Value() < 17) || (Get_Front_TPMS_Sig_Value() > 23))
                     {
                         TPMS.TPMS_Warning = 1;
                     }
@@ -441,7 +441,7 @@ void Data_TPMS_Processing_Service ( void )
                     TPMS.Rear_Press_Value = 9900;
                 }
                 //if (((TPMS.Front_Press_Value + 50) < 1700) || ((TPMS.Front_Press_Value + 50) > 2300) || ((TPMS.Rear_Press_Value + 50) < 1700) || ((TPMS.Rear_Press_Value + 50) > 2500))
-                if ((Get_Front_TPMS_Sig_Value() < 17) || (Get_Front_TPMS_Sig_Value() > 25) || (Get_Rear_TPMS_Sig_Value() < 17) || (Get_Rear_TPMS_Sig_Value() > 25))
+                if ((Get_Front_TPMS_Sig_Value() < 17) || (Get_Front_TPMS_Sig_Value() > 23) || (Get_Rear_TPMS_Sig_Value() < 17) || (Get_Rear_TPMS_Sig_Value() > 25))
                 {
                     TPMS.TPMS_Warning = 1;
                 }

Firmware/Source/Component/PowerManagement/PowerManag_user.c

@@ -236,10 +236,6 @@ static void Power_Sleep_Init(void)
     LED_Driver_Service();
     Analog_Signal_Conv_Stop();
     UART_DeInit(UART0);
-    //if(RTE_GPIO_Get_Level(WAKEUP_KL15_In) == 0)
-    {
-        RTE_DEEPSLEEP_Enable();
-    }
     
 }
 
@@ -351,11 +347,16 @@ static Power_Status_em Power_Stay_Protect(void)
 static Power_Status_em Power_Stay_Sleep(void)
 {
     Power_Status_em u8PowerSts = EM_IGN_Sleep;
-
+    
+    
     while (1)
     {
         RTE_WDT_Clear();
-        if (RTE_GPIO_Get_Level(WAKEUP_KL15_In))/* KL15 */
+        if(RTE_GPIO_Get_Level(WAKEUP_KL15_In) == 0)
+        {
+            RTE_DEEPSLEEP_Enable();
+        }
+        else //(RTE_GPIO_Get_Level(WAKEUP_KL15_In))/* KL15 */
         {
             u8PowerSts = EM_IGN_Wakeup;
             break;

Firmware/Source/UDS/UDS_ISO14229_Services.h

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

Firmware/utility/诊断工具/Option/Option.properties

 #new Option
-#Mon Aug 19 18:11:24 CST 2024
+#Wed Aug 21 15:17:41 CST 2024
 IsSort=true
 MergeFlashIsCompression=false
 ChangeAppFilePath=
@@ -7,7 +7,7 @@ MergeCanXLSPath=
 RH850_D1M1AGPIOJSONpath=
 DBFFilePath=
 MergeCrcTtpe=21
-MergeBootFilePath=D\:\\Git\\\u5929\u9E70\\tianying_ty100\\Firmware\\utility\\Boot_Release\\TY200.080000b(ty)\\TY_TY200.080000b(ty)_Boot_B1.03_240814.hex
+MergeBootFilePath=D\:\\Git\\\u5929\u9E70\\tianying_ty100\\Firmware\\utility\\Boot_Release\\TY200.080000b(ty)\\TY_TY200.080000b(ty)_Boot_B1.04_240820.hex
 IsMergeChangeAddress=false
 MergeFlashOutPutFilePath=
 GPIOOutPutPath=
@@ -56,8 +56,8 @@ IsHexDisplay=true
 MergeLineInXLSPath=
 MergeFlashInPutFilePath=
 MergeFlashIsInternal=false
-MergeOutPutFilePath=D\:\\Git\\\u5929\u9E70\\tianying_ty100\\Firmware\\utility\\\u7A0B\u5E8F\u91CA\u653E\\20240819
-MergeAppFilePath=D\:\\Git\\\u5929\u9E70\\tianying_ty100\\Firmware\\utility\\\u7A0B\u5E8F\u91CA\u653E\\20240819\\TianYing.hex
+MergeOutPutFilePath=D\:\\Git\\\u5929\u9E70\\tianying_ty100\\Firmware\\utility\\\u7A0B\u5E8F\u91CA\u653E\\20240821
+MergeAppFilePath=D\:\\Git\\\u5929\u9E70\\tianying_ty100\\Firmware\\utility\\\u7A0B\u5E8F\u91CA\u653E\\20240821\\TianYing.hex
 MergeTelltalesXLSPath=
 FillingByte=-86
 ImageVersion=0