Merge branch 'shihao' into 'dev'

Shihao

See merge request !16

le19源码/Source/Application/Device/LED_Driver_Interface.c

@@ -45,8 +45,17 @@ const LED_Driver_uint8_t u8IS31ChipAddress[LED_DRIVER_CHIP_NUM] = {
 
 };
 
+uint8_t Led_Back_Status = 0;
 /*设置shutdown引脚*/
 void LED_Driver_Shutdown_Pin_Set(LED_Driver_uint8_t u8Level)
 {
 	LED_DRIVER_EN = u8Level;
+	if(Led_Back_Status == 0)
+	{
+		if(u8Level)
+		{
+			Gen_TimeDelay(50 * 1000u, 50u);
+		}
+	}
+	Led_Back_Status = u8Level;
 }

le19源码/Source/Application/Display/Gauge_Display.c

@@ -192,8 +192,8 @@ uint16_t Get_Over_Speed_Config(uint8_t Para0)
 
 void Gauge_Power_Display(void)
 {
-    uint8_t  powerSegNum;
-    uint16_t powerDisplayValue;
+    uint8_t  powerSegNum = 0;
+    uint16_t powerDisplayValue = 0;
     uint8_t  powerDisplaySign;
 
     uint32_t powerCurrentValue;

le19源码/Source/Application/Power/PowerManagement.c

@@ -380,7 +380,7 @@ void Power_Wakeup_Init(void)
     HW_Key_KL30_Wakeup_Init( );   
     Telltales_Init( );
     BackLight_Wakeup_Init( );
-    BU98R10_Init( );
+    
     Sound_Player_Init( );
     Sound_Scheduler_Init( );
     Popup_Scheduler_Init( );
@@ -389,6 +389,8 @@ void Power_Wakeup_Init(void)
     LED_Driver_Init_Wakeup(u8LEDDriverRamData, &led_dr);
     Maintenance_Init_Example();
     Can18fee69f_receive = 0;
+    Gen_TimeDelay(120000ul,50ul);
+    BU98R10_Init( );
 }
 /**********************************************************************************************************
  *@Function:        Power_Management_Init

le19源码/Source/Application/System/src/Tasks.c

@@ -145,7 +145,7 @@ void Sys_Run_Mode_20ms_Tasks_Group0(void)
 {    
     Gauge_Service();                    //量表显示服务
     Line_In_Debounce_Service();         //硬线处理
-    Temp_Calc_Send();
+    //Temp_Calc_Send();
 }
 
 

le19源码/Source/Application/UDS/APP/Common/UDS_Common.c

@@ -28,7 +28,7 @@ Ser2EToDFlashInfoUnion Ser2EToDFlashInfo;
 DTCToDFlashInfoUnion DTCToDFlashInfo;
  const uint8_t DID_F180[16]= {'1','0','3',0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20};
  const uint8_t DID_F187[21]={'9','9','0','0','1','6','2','7','4','4',0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20};
- const uint8_t DID_F189[16]={'0','0','1','.','0','0','4',0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20};//主机厂定义的软件版本编号
+ const uint8_t DID_F189[16]={'0','0','1','.','0','0','3',0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20};//主机厂定义的软件版本编号
  const uint8_t DID_F191[16]={'0','0','1','.','0','0','1',0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20};//主机厂定义的硬件版本编号
  const uint8_t DID_F193[16]={'H','V','0','0','1','.','0','0','1',0x20,0x20,0x20,0x20,0x20,0x20,0x20};//供应商定义的硬件版本编号
  const uint8_t DID_F199[4]={0x20u,0x23u,0x02u,0x24u};
@@ -39,7 +39,7 @@ DTCToDFlashInfoUnion DTCToDFlashInfo;
  const uint8_t Ser22_DID_F18A[6] = {'4', '5', '1', '0', '0', '3'}; 
  const uint8_t Ser22_DID_F18B[4] = {0x20, 0x23, 0x02, 0x24};       
  const uint8_t Ser22_DID_F18C[24] = "0000";                          
- const uint8_t Ser22_DID_F195[16] = "SV001.004       ";//供应商定义的软件版本编号                 	 
+ const uint8_t Ser22_DID_F195[16] = "SV001.003       ";//供应商定义的软件版本编号                 	 
  const uint8_t Ser22_DID_F1A2[4] ={0x20,0x23,0x02,0x24};
  /*const uint8_t Ser22_DID_F1AA[8];                                  
  const uint8_t Ser22_DID_F1AE[] = "";                              
@@ -933,7 +933,7 @@ void Ser2EToDFlashInfoInit(void)
     EOL_F101 = EOL_GetF101();
     EOL_F110 = EOL_GetF110();
     EOL_F102 = EOL_GetF102();
-    for (i = 0u; i < 16u; ++i)
+    for (i = 0u; i < 8u; ++i)
     {
         Ser2EToDFlashInfo.DID_F101[i] = EOL_F101.F101_Byte[i];
     }

le19源码/Source/Application/UDS/APP/UDS_2EService/UDS_2EService_Main.c

@@ -452,7 +452,7 @@ void UDS_2EService_DID_7103(void)
 
 void Clear7103_Cbk(void)
 {
-    memcpy(Ser2EToDFlashInfo.DID_7103, 0, 1);
+    Ser2EToDFlashInfo.DID_7103[0]=0;
     ( void )write2EData(Write2EData);
 }
 uint32_t Get_7101_Value(void)

le19源码/Source/Library/Driver/inc/GPIO_Config.h

@@ -4,7 +4,7 @@
   * \attention
   *
   * This file is automatically generated by GPIO configuration tool.
-  * Date         : 2023-03-31 11:03:04
+  * Date         : 2024/6/25 17:26:52
   * Cfg Tool Ver : 1.0.0
   * (c) Heilongjiang TYW electronics co., LTD
   *
@@ -74,7 +74,7 @@ typedef struct
 #define     SDA_LED_DRIVER                  GPIO_PODR1_POD5
 #define     SCL_LED_DRIVER                  GPIO_PODR1_POD6
 #define     Line_In_DoorOpen                GPIO_PIDR1_PID7
-#define     MCU_EEPROM_SCL                  GPIO_PODR1_POD8
+#define     MCU_EEPROM_SCL                  GPIO_PIDR1_PID8
 #define     MCU_EEPROM_SDA                  GPIO_PODR1_POD9
 #define     GPIO_KL15                       GPIO_PIDR1_PID10
 #define     SD_MODE_MCU                     GPIO_PODR1_POD11

le19源码/Source/Library/Driver/src/GPIO_Config.c

@@ -4,7 +4,7 @@
   * \attention
   *
   * This file is automatically generated by GPIO configuration tool.
-  * Date         : 2024/1/28 10:25:53
+  * Date         : 2024/6/25 17:26:52
   * Cfg Tool Ver : 1.0.0
   * (c) Heilongjiang TYW electronics co., LTD
   *
@@ -19,7 +19,7 @@ const GPIO_Dir_Def_Cfg_t GPIODirDefCfg[GPIO_VALID_PORT_NUM] =
 {
 /*  RunModeDir    RunModeDef    SleepModeDir  SleepModeDef  */
   { 0x240310FFUL,   0x26001020UL,   0x240310FFUL,   0x26000040UL,},
-  { 0xFFF59B70UL,   0x00000000UL,   0xC0019B63UL,   0x00000360UL,},
+  { 0xFFF59A70UL,   0x00000000UL,   0xC0019B63UL,   0x00000360UL,},
   { 0x18FFFFFAUL,   0x0847C80AUL,   0x38FFFFFAUL,   0x00400000UL,},
   { 0x00000000UL,   0x00000000UL,   0x00000000UL,   0x00000000UL,},
 };

utility/程序释放/le19_2024-6-27/雷达数据/雷达接线.txt

+
+中间4线探头 深绿是数据 拔掉会长鸣 黄色蓝色是电源拔掉任意一个都会响 浅绿是地
+右后3线探头 深绿是数据 黄色是电源 浅绿是地
+左后4线探头 浅绿是数据 深绿是电源 黄色蓝色是地                 
\ No newline at end of file