Merge branch 'liang_buf' into '依维柯216变更后'

TYW-2025-00296

See merge request !39

source/Appliciation/DataProcess.c

@@ -1186,7 +1186,7 @@ uint8_t GetRangeValid(void)
 
 void GUI_Sound_Init(void)
 {
-	MenuData.Sound = 2;
+	MenuData.Sound = 3;
 	Buzzer_Volume_Set(MenuData.Sound );
 }
 
@@ -3700,4 +3700,9 @@ INT8U Get_Mcu_Abnormal_Reset(void)
 INT8U Get_NodeConfig_LWDS(void)
 {
 	return Val_EOL_F010_LWDS(); 
+}
+
+INT8U Get_Cofig_Backradar(void)
+{
+	return Val_EOL_F010_Backradar(); 
 }
\ No newline at end of file

source/Appliciation/DataProcess.h

@@ -560,6 +560,7 @@ INT8U Get_NodeConfig_TPMS(void);
 INT8U Get_NodeConfig_AirBag(void);
 INT8U Get_NodeConfig_ESP(void);
 INT8U Get_NodeConfig_LWDS(void);
+INT8U Get_Cofig_Backradar(void);
 INT8U Get_NodeConfig_GearBoxType(void);
 void MenuData_Time_Service(void);
 void Can18FF9CF1_Lost (void);

source/Appliciation/Popup_Alarm_Handle.c

@@ -1226,16 +1226,16 @@ void Popups_Alarm_Trigger_LDWS(void)
 
             if(Get_CAN_CH0_ID_18FE5BE8_Sig_Lane_Departure_Indication_Enable_Status() == 0)
             {
-                Pop_Alarm_Request_Normal(POP_ALARM_LDWS_CLOSE);
+                // Pop_Alarm_Request_Normal(POP_ALARM_LDWS_CLOSE);//关闭LDWS关闭弹窗
             }
             else
             {
-                Pop_Alarm_Delete_Normal(POP_ALARM_LDWS_CLOSE, POP_DELAY_MIN);
+                // Pop_Alarm_Delete_Normal(POP_ALARM_LDWS_CLOSE, POP_DELAY_MIN);
             }
         }
         else
         {
-            Pop_Alarm_Delete_Normal(POP_ALARM_LDWS_CLOSE, POP_DELAY_MIN);
+            // Pop_Alarm_Delete_Normal(POP_ALARM_LDWS_CLOSE, POP_DELAY_MIN);
             Pop_Alarm_Delete_Normal(POP_ALARM_LDWS_FAILURE, POP_DELAY_MIN);
             Pop_Alarm_Delete_Normal(POP_ALARM_LDWS_ATCIVE, POP_DELAY_MIN);
             Pop_Alarm_Delete_Normal(POP_ALARM_LDWS_L, POP_DELAY_MIN);
@@ -1444,7 +1444,11 @@ void Popups_Alarm_Trigger_Service(void)
 
     Popups_Alarm_Trigger_GEARBOX_HIGH_TEMP( );
     Popups_Alarm_Trigger_GEARBOX_CAUTION( );
-    Popups_Alarm_Trigger_RADAR_FAILURE( );
+    if(Get_Cofig_Backradar() == 1)
+    {
+        Popups_Alarm_Trigger_RADAR_FAILURE( );//倒车雷达
+    }
+
     Popups_Alarm_Trigger_GEARBOX_FAILURE( );
     Popups_Alarm_Trigger_PARK_IN_P( );
     Popups_Alarm_Trigger_P_INVALID( );

source/Appliciation/Sound_Alarm_User.c

@@ -99,7 +99,7 @@ const Sound_Alarm_Attribute_st_t stSoundAlarmAttribute [ SOUND_ALARM_MAX ] = {
     /*SOUND_ALARM_TICK*/ {SOUND_VARIETY_TICK, 1U, SOUND_ALARM_TRIGGER_MULTI, SOUND_ALARM_BREAK_NONE, SOUND_ALARM_NUM_FINISH_RESET},
     /*SOUND_ALARM_TOCK*/ {SOUND_VARIETY_TOCK, 1U, SOUND_ALARM_TRIGGER_MULTI, SOUND_ALARM_BREAK_NONE, SOUND_ALARM_NUM_FINISH_RESET},
    
-    /*SOUND_ALARM_LDWS*/ {SOUND_VARIETY_4, 0xFFU, SOUND_ALARM_TRIGGER_NORMAL, SOUND_ALARM_RECOVER_CONTINUE, SOUND_ALARM_NUM_FINISH_RESET},
+    /*SOUND_ALARM_LDWS*/ {SOUND_VARIETY_RADAR_8, 2U, SOUND_ALARM_TRIGGER_NORMAL, SOUND_ALARM_RECOVER_CONTINUE, SOUND_ALARM_NUM_RESET},
     /*SOUND_ALARM_LOW_OIL_PRESSURE*/ {SOUND_VARIETY_3, 3U, SOUND_ALARM_TRIGGER_NORMAL, SOUND_ALARM_BREAK_NONE, SOUND_ALARM_NUM_FINISH_RESET},
 
 };

source/Appliciation/Sound_Alarm_handle.c

@@ -861,7 +861,11 @@ void Sound_Alarm_Trigger_Service(void)
     {
         Sound_Alarm_Trigger_DPF( );
         Sound_Alarm_Trigger_DOOR( );
-        Sound_Alarm_Trigger_RADAR( );
+        if(Get_Cofig_Backradar() == 1)
+        {
+            Sound_Alarm_Trigger_RADAR( );//倒车雷达
+        }
+
         Sound_Alarm_Trigger_GEAR_P( );
         Sound_Alarm_Trigger_TEMP( );
         Sound_Alarm_Trigger_Par_Full_Reset( );

source/Driver/GPIO/RTE_GPIO.c

@@ -87,7 +87,7 @@ static const r_dev_PinConfig_t loc_ALL_GPIO [] =
         {44, 1, 0u, R_DEV_PIN_OUT, 0u, R_DEV_PIN_PULLNO, 0u, 0u, 0u, R_DEV_PIN_CMOS1},    // EEPROM_SDA_MCU
         {44, 2, 0u, R_DEV_PIN_IN, 0u, R_DEV_PIN_PULLNO, 0u, 0u, 0u, R_DEV_PIN_CMOS1},     // EEPROM_SDA_MCU
         {44, 3, 0u, R_DEV_PIN_IN, 0u, R_DEV_PIN_PULLNO, 0u, 0u, 0u, R_DEV_PIN_CMOS1},     // EEPROM_SCL_MCU
-        {44, 6, 2u, R_DEV_PIN_IN, 0u, R_DEV_PIN_PULLNO, 0u, 0u, 0u, R_DEV_PIN_CMOS1},     /*屏TEB*/
+        {44, 6, 2u, R_DEV_PIN_IN, 0u, R_DEV_PIN_PULLDOWN, 0u, 0u, 0u, R_DEV_PIN_CMOS1},     /*屏TEB*/
 
         {45, 5, 0u, R_DEV_PIN_OUT, 0u, R_DEV_PIN_PULLNO, 0u, 0u, 0u, R_DEV_PIN_CMOS1},    /*屏XRES*/
         {45, 6, 0u, R_DEV_PIN_OUT, 0u, R_DEV_PIN_PULLNO, 0u, 0u, 0u, R_DEV_PIN_CMOS1},

source/UDS/EOL_Para.c

@@ -121,3 +121,10 @@ uint8_t Val_EOL_F010_LWDS(void)
     Res = (uint8_t)((EOL_F010.F010_Byte[3u] >> 2u) & 0x01);
     return Res;
 }
+
+uint8_t Val_EOL_F010_Backradar(void)
+{
+    uint8_t Res = 0u;
+    Res = (uint8_t)((EOL_F010.F010_Byte[3u] >> 4u) & 0x01);
+    return Res;
+}

source/UDS/EOL_Para.h

@@ -28,5 +28,6 @@ uint8_t Val_EOL_F010_GearBoxType(void);
 /*BYTE 3*/
 uint8_t Val_EOL_F010_FourWheelAlarm(void);
 uint8_t Val_EOL_F010_LWDS(void);
-
+/*BYTE ?*/
+uint8_t Val_EOL_F010_Backradar(void);
 #endif
\ No newline at end of file

source/UDS/UDS_22Service_Main.c

@@ -13,7 +13,7 @@ const uint8_t DID_22_F193[8]   = {'V','1','.','1',0x20,0x20,0x20,0x20};
 /*ECUHardwareVersionNumberDataIdentifier（软件号）*/
 const uint8_t DID_22_F194[16]   = {'5','8','0','3','3','1','0','8','1','7',0x20,0x20,0x20,0x20,0x20,0x20};
 /*ECUSoftwareVersionNumberDataIdentifier（软件版本号）*/
-const uint8_t DID_22_F195[8]   = {'V','1','.','5',0x20,0x20,0x20,0x20};
+const uint8_t DID_22_F195[8]   = {'V','1','.','6',0x20,0x20,0x20,0x20};
 /*SystemNameDataIdentifier（ECU名称）*/
 const uint8_t DID_22_F197[10]   = {'I','C','-','N','S','2','0','8','-','2'};
 /*EOLProgrammingDate*/