Merge branch 'CHENJIALE' into 'dev'

Chenjiale

See merge request ty/tianying_ty100!56

Firmware/Source/Application/GUI_Display/GUI_Display.c

@@ -76,7 +76,7 @@ void Gauge_Service(void)
             {
                 if (k == 24 || k == 21 || k == 13 || k == 26)
                 {
-                    k ++;
+                    //k ++;
                 }
                 else
                 {

Firmware/Source/Application/SEG_DISPLAY/SEG_DISPLAY.c

@@ -1947,6 +1947,10 @@ void SEG_SET_Voltage_NUM(uint8_t m_Flag, uint16_t m_NUM)
             {
                 m8 = SEG_DISPLAY_NUMBER0[Num];
             }
+            else if(m_NUM < 10)
+            {
+                m8 = SEG_DISPLAY_NUMBER0[0];
+            }
             else
             {
                 m8 = SEG_UNDISPLAY_NUMBER0[Num];

Firmware/Source/Component/Line_In/Line_In_user.c

@@ -12,7 +12,7 @@ const Line_In_Attribute_st g_stLineInAttribute[LINE_IN_MAX] =
     {LEVEL_HIGH,   LEVEL_LOW,    LINE_IN_IG_ON,     120U,  20U,  Get_LINE_IN_FAULT_ELECTROSPRAY, },
     {LEVEL_HIGH,   LEVEL_LOW,    LINE_IN_IG_ON,     170U,  20U,  Get_LINE_IN_Fault_ABS, },
     {LEVEL_HIGH,   LEVEL_LOW,    LINE_IN_IG_ON,     500U,  20U,  Get_LINE_IN_Oil_Pressure, },
-    {LEVEL_HIGH,   LEVEL_LOW,    LINE_IN_IG_ON,     100U,  20U,  Get_LINE_IN_Auto_Start_Stop, },
+    {LEVEL_HIGH,   LEVEL_LOW,    LINE_IN_IG_ON,     150U,  20U,  Get_LINE_IN_Auto_Start_Stop, },
     {LEVEL_LOW,    LEVEL_HIGH,   LINE_IN_IG_ON,     100U,  20U,  Get_LINE_IN_Little_Lamp, },
 };
 

Firmware/Source/Component/Telltales/Telltales_user.c

@@ -631,7 +631,7 @@ static Tellib_uint16_t LED_Tire_Pressure_Judgement(void)
     }
     else if((Get_Front_FirstLearn_Flag() == 2) || (Get_Rear_FirstLearn_Flag() == 2))
     {
-        if(Get_Led_TPMS_Waring() == 1)
+        if((Get_Led_TPMS_Waring() == 1) && ((Get_Front_TPMS_ID_Vaild() == 1) || (Get_Rear_TPMS_ID_Vaild() == 1)))
         {
             LED_STATE = 1;
         }

Firmware/Source/UDS/UDS_ISO14229_Services.h

@@ -314,10 +314,10 @@
 #define SWV 0x100 // 0x100 = 1.00 software version 软件版本号
 #define HWV 0x101 // 0x100 = 1.00 hardware version 硬件版本号
 #define BTV 0x100 // 0x100 = 1.00 bootloader version boot程序版本号
-#define INTLV 0x108 // 0x100 = 1.00 internal version 内部版本号
+#define INTLV 0x109 // 0x100 = 1.00 internal version 内部版本号
 #define PROG_Y 0x24 // 0x24 = 2024年, program year
 #define PROG_M 0x07 // 0x03 = 3月, program month
-#define PROG_D 0x18 // 0x19 = 19日, program day
+#define PROG_D 0x24 // 0x19 = 19日, program day
 
 /******************************************************************************
  Bootloader Variable

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

 #new Option
-#Thu Jul 18 09:36:34 CST 2024
+#Wed Jul 24 09:13:14 CST 2024
 IsSort=true
 MergeFlashIsCompression=false
 ChangeAppFilePath=
@@ -7,7 +7,7 @@ MergeCanXLSPath=
 RH850_D1M1AGPIOJSONpath=
 DBFFilePath=
 MergeCrcTtpe=21
-MergeBootFilePath=D\:\\git\\tianying_ty100\\Firmware\\utility\\Boot_Release\\TY200.080000b(ty)\\TY_TY200.080000b(ty)_Boot_B1.01_240620.hex
+MergeBootFilePath=D\:\\git\\tianying_ty100\\Firmware\\utility\\Boot_Release\\TY200.080000b(ty)\\TY_TY200.080000b(ty)_Boot_B1.02_240719.hex
 IsMergeChangeAddress=false
 MergeFlashOutPutFilePath=
 GPIOOutPutPath=
@@ -56,8 +56,8 @@ IsHexDisplay=true
 MergeLineInXLSPath=
 MergeFlashInPutFilePath=
 MergeFlashIsInternal=false
-MergeOutPutFilePath=D\:\\git\\tianying_ty100\\Firmware\\utility\\\u7A0B\u5E8F\u91CA\u653E\\20240718\\TY_TY200.080000b_ty_BAT32G139GK64FB_BootApp_S1.08_240718
-MergeAppFilePath=D\:\\git\\tianying_ty100\\Firmware\\utility\\\u7A0B\u5E8F\u91CA\u653E\\20240718\\TianYing.hex
+MergeOutPutFilePath=D\:\\git\\tianying_ty100
+MergeAppFilePath=D\:\\git\\tianying_ty100\\TianYing.hex
 MergeTelltalesXLSPath=
 FillingByte=-86
 ImageVersion=0