Merge branch 'lijianshuang' into 'dev'

Lijianshuang

See merge request !29

Firmware/Project/Cmsemicon/BAT32A239/MDK_ARM/TianYing.uvprojx

@@ -275,7 +275,7 @@
               </OCR_RVCT3>
               <OCR_RVCT4>
                 <Type>1</Type>
-                <StartAddress>0x8000</StartAddress>
+                <StartAddress>0x0</StartAddress>
                 <Size>0x40000</Size>
               </OCR_RVCT4>
               <OCR_RVCT5>

Firmware/Source/Component/Line_In/Line_In_user.c

@@ -82,6 +82,7 @@ Linelib_uint8_t Get_LINE_IN_FAULT_ELECTROSPRAY(void)
     {
         ret = 0;
     }
+    return ret;
 }
 
 Linelib_uint8_t Get_LINE_IN_Fault_ABS(void)
@@ -95,6 +96,7 @@ Linelib_uint8_t Get_LINE_IN_Fault_ABS(void)
     {
         ret = 0;
     }
+    return ret;
 }
 
 Linelib_uint8_t Get_LINE_IN_Oil_Pressure(void)
@@ -108,6 +110,7 @@ Linelib_uint8_t Get_LINE_IN_Oil_Pressure(void)
     {
         ret = 0;
     }
+    return ret;
 }
 
 

Firmware/Source/Component/Telltales/Telltales_user.c

@@ -62,8 +62,9 @@ const LED_Attribute_st LED_Attribute [ LED_Max ] = {
     {em_LED_Lateral_Strut,          SelfCheck,     NoExterNalCheck,        LED_IGN_ON,             0u,         3000ul,         LED_Lateral_Strut_Judgement,        LED_Lateral_Strut_Execution},
 #if(IC_Current == TY200_080000b_ty)
     {em_LED_Tire_Pressure_Alarm,    SelfCheck,     NoExterNalCheck,        LED_IGN_ON,             0u,         3000ul,         LED_Tire_Pressure_Judgement,        LED_Tire_Pressure_Execution},
-    //{em_LED_Navigator,              SelfCheck,     NoExterNalCheck,        LED_IGN_ON,             0u,         3000ul,         LED_Navigato_Judgement,             LED_Navigato_Execution},
 #endif
+    //{em_LED_Navigator,              SelfCheck,     NoExterNalCheck,        LED_IGN_ON,             0u,         3000ul,         LED_Navigato_Judgement,             LED_Navigato_Execution},
+
 };
 
 

Firmware/Source/UDS/UDS_ISO14229_Services.h

@@ -313,7 +313,7 @@
 #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 0x101 // 0x100 = 1.00 internal version 内部版本号
+#define INTLV 0x102 // 0x100 = 1.00 internal version 内部版本号
 #define PROG_Y 0x24 // 0x24 = 2024年, program year
 #define PROG_M 0x05 // 0x03 = 3月, program month
 #define PROG_D 0x27 // 0x19 = 19日, program day

Firmware/utility/程序释放/20240606/TY_TY200.080000b_ESP32-D0WD-V3_BootApp_S1.00_240606/ota_data_initial.bin

+
\ No newline at end of file

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

 #new Option
-#Mon Jun 03 09:12:48 CST 2024
+#Thu Jun 06 11:11:09 CST 2024
 IsSort=true
 MergeFlashIsCompression=false
 ChangeAppFilePath=