Merge branch 'lijianshuang' into 'dev'

Lijianshuang

See merge request ty/tianying_ty100!38

Firmware/Source/Application/Fuel/Data_Fuel.c

@@ -236,22 +236,22 @@ void Fuel_Gauges_Cal(uint8_t deltaTime)
                 {
                     DesFuelSetp = 3;
                 }
-                else if (((DesFuelSetp == 1) || FuelInitFlag) && (FuelR < 630))
+                else if (((DesFuelSetp == 1) || FuelInitFlag) && (FuelR < 710))
                 {
                     DesFuelSetp = 2;
                 }
-                else if (((DesFuelSetp == 0) || FuelInitFlag) && (FuelR < 880))
+                else if (((DesFuelSetp == 0) || FuelInitFlag) && (FuelR < 910))
                 {
                     DesFuelSetp = 1;
                 }
             }
             else if (FuelDir == FUEL_SEG_DOWN)
             {
-                if (((DesFuelSetp == 1) || FuelInitFlag) && (FuelR >= 880))
+                if (((DesFuelSetp == 1) || FuelInitFlag) && (FuelR >= 910))
                 {
                     DesFuelSetp = 0;
                 }
-                else if (((DesFuelSetp == 2) || FuelInitFlag) && (FuelR >= 630))
+                else if (((DesFuelSetp == 2) || FuelInitFlag) && (FuelR >= 710))
                 {
                     DesFuelSetp = 1;
                 }

Firmware/Source/UDS/UDS_ISO14229_Services.h

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

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

 #new Option
-#Mon Jul 01 14:18:29 CST 2024
+#Tue Jul 02 09:52:52 CST 2024
 IsSort=true
 MergeFlashIsCompression=false
 ChangeAppFilePath=
@@ -56,8 +56,8 @@ IsHexDisplay=true
 MergeLineInXLSPath=
 MergeFlashInPutFilePath=
 MergeFlashIsInternal=false
-MergeOutPutFilePath=D\:\\Git\\\u5929\u9E70\\tianying_ty100\\Firmware\\utility\\\u7A0B\u5E8F\u91CA\u653E\\20240701
-MergeAppFilePath=D\:\\Git\\\u5929\u9E70\\tianying_ty100\\Firmware\\utility\\\u7A0B\u5E8F\u91CA\u653E\\20240701\\TianYing.hex
+MergeOutPutFilePath=D\:\\Git\\\u5929\u9E70\\tianying_ty100\\Firmware\\utility\\\u7A0B\u5E8F\u91CA\u653E\\20240702
+MergeAppFilePath=D\:\\Git\\\u5929\u9E70\\tianying_ty100\\Firmware\\utility\\\u7A0B\u5E8F\u91CA\u653E\\20240702\\TianYing.hex
 MergeTelltalesXLSPath=
 FillingByte=-86
 ImageVersion=0