调整声音，调整诊断ID

source/Application/APP/PowerManagement/PowerManagement_user.c

@@ -132,11 +132,11 @@ void Power_Sleep_Init(void)
     //TimerB_PWM_Channel_Sleep(TIMERB_2_CH10);
     //TimerB_PWM_Channel_Sleep(TIMERB_1_CH10);
 
-    VCC12V0_OUT_EN = 1U;        /*12V 电源使能*/
-    VCC05V0_OUT_EN = 1U;        /*外设5V 电源使能*/
-    D1530_EN_MCU_OUT = 1U;      /*1530 使能*/
+    VCC12V0_OUT_EN = 1u;        /*12V 电源使能*/
+    VCC05V0_OUT_EN = 1u;        /*外设5V 电源使能*/
+    D1530_EN_MCU_OUT = 1u;      /*1530 使能*/
     //BL_ACC_EN = 1U;             /*8867 使能*/
-    Fuel_VCC05V_OUT_EN = 1U ;   /*燃油电源 使能*/
+    Fuel_VCC05V_OUT_EN = 1u ;   /*燃油电源 使能*/
     AIR_5V_OUT_EN = 1u;         /*气压 5V*/
     ACC5V_LED_PWM_MCU = 1u;
     BUZZER_ACC_OUT_EN = 1u;
@@ -180,11 +180,11 @@ Power_Status_t Power_Wakeup_Init ( void )
     /*安全带 车门部分  李茂军维护结束*/
     RTE_PWM_Init();
 
-    VCC12V0_OUT_EN = 1U;        /*12V 电源使能*/
-    VCC05V0_OUT_EN = 1U;        /*外设5V 电源使能*/
-    D1530_EN_MCU_OUT = 1U;      /*1530 使能*/
+    VCC12V0_OUT_EN = 1u;        /*12V 电源使能*/
+    VCC05V0_OUT_EN = 1u;        /*外设5V 电源使能*/
+    D1530_EN_MCU_OUT = 1u;      /*1530 使能*/
     //BL_ACC_EN = 1U;             /*8867 使能*/
-    Fuel_VCC05V_OUT_EN = 1U ;   /*燃油电源 使能*/
+    Fuel_VCC05V_OUT_EN = 1u ;   /*燃油电源 使能*/
     AIR_5V_OUT_EN = 1u;         /*气压 5V*/
     ACC5V_LED_PWM_MCU = 1u;
     BUZZER_ACC_OUT_EN = 1u;

source/Application/Alarm/Popups.c

@@ -1309,8 +1309,9 @@ void Popup_Alone_Sound_Server(void)
             }
 
             /*15 DPD 手动再生*/
-            variable_1 = Get_ID_18FE5BE8_Sig_Camera_Status();
-            if (variable_1 == 2u)
+            //variable_1 = Get_ID_18FE5BE8_Sig_Camera_Status();
+            //if (variable_1 == 2u)
+            if (0)
             {
                 Sound_Request(SND_DPD_SPEED1, 1u);
             }
@@ -1319,9 +1320,10 @@ void Popup_Alone_Sound_Server(void)
                 Sound_Delete(SND_DPD_SPEED1);
             }
 
-            /*15 DPD 手动再生*/
-            variable_1 = Get_ID_18FE5BE8_Sig_Camera_Status();
-            if (variable_1 == 1u)
+            /*15 DPD 手动再生    SXI-VC66-342_36ページ訂正 20220418*/
+            //variable_1 = Get_ID_18FE5BE8_Sig_Camera_Status();
+            variable_1 = Get_ID_18FD7C00_Sig_DPF_Lamp_Status_Amber();
+            if (variable_1 == 4u)
             {
                 Sound_Request(SND_DPD_SPEED2, 1u);
             }
@@ -1331,8 +1333,9 @@ void Popup_Alone_Sound_Server(void)
             }
 
             /*15 DPD 手动再生*/
-            variable_1 = Get_ID_18FE5BE8_Sig_Camera_Status();
-            if (variable_1 == 3u)
+            //variable_1 = Get_ID_18FE5BE8_Sig_Camera_Status();
+            //if (variable_1 == 3u)
+            if (0)
             {
                 Sound_Request(SND_DPD_SPEED4, 1u);
             }
@@ -1363,8 +1366,9 @@ void Popup_Alone_Sound_Server(void)
 
             if ((K_Line_Set.K_Line_LID2A == 0X01u) || (K_Line_Set.K_Line_LID2A == 0X02u))
             {
-                /*18 气悬车高调整*/
-                variable_1 = Get_ID_CFF0F15_Sig_ID0CFF0F15_byte1_bit4_5();
+                /*18 气悬车高调整  SXI-VC66-342_36ページ訂正 20220418*/
+                //variable_1 = Get_ID_CFF0F15_Sig_ID0CFF0F15_byte1_bit4_5();
+                variable_1 = Line_In_Get_Status(LINE_IN_AIR_SUS);
                 if (variable_1 == 1u)
                 {
                     Sound_Request(SND_Cyclone_High4HZ, 1u);
@@ -1374,9 +1378,11 @@ void Popup_Alone_Sound_Server(void)
                     Sound_Delete(SND_Cyclone_High4HZ);
                 }
 
-                /*18 气悬车高调整*/
-                variable_1 = Get_ID_CFF0F15_Sig_ID0CFF0F15_byte1_bit4_5();
-                if (variable_1 == 3u)
+                /*18 气悬车高调整  SXI-VC66-342_36ページ訂正 20220418*/
+                //variable_1 = Get_ID_CFF0F15_Sig_ID0CFF0F15_byte1_bit4_5();
+                variable_1 = Line_In_Get_Status(LINE_IN_AIR_SUS);
+                variable_2 = Common_Get_Disp_V_Speed();
+                if ((variable_1 == 1u) && (variable_2 == 66u))
                 {
                     Sound_Request(SND_Cyclone_High0_5, 1u);
                 }

source/Application/RTE/RTE_CAN.c

@@ -151,10 +151,10 @@ void Can_Read_Msg2(uint32_t m_id, uint8_t m_dlc, uint8_t m_Msg[])
     {
         LK_Link_main(DIAG_ID_Rx_PHY, (uint8_t*)m_Msg, (m_dlc & 0x0f));
     }
-    //if ((m_id == DIAG_ID_Rx_FUN) || (m_id == DIAG_ID_Rx_PHY))
-    //{
-    //    DoCAN_L_Data_Indication(m_id, m_dlc, m_Msg);
-    //}
+    if ((m_id == DIAG_ID_Rx_FUN) || (m_id == DIAG_ID_Rx_PHY))
+    {
+        DoCAN_L_Data_Indication(m_id, m_dlc, m_Msg);
+    }
 }
 
 void Can_Confirm(uint32_t Identifier, uint8_t TransferStatus)

source/Application/UDS/TP/Diag_ID_Def.h

@@ -8,8 +8,8 @@
 #ifndef _DIAG_ID_DEF_H_
 #define _DIAG_ID_DEF_H_
 
-#define DIAG_ID_Tx                0x07E0            /*发送ID*/
-#define DIAG_ID_Rx_PHY            0x07E8            /*接收ID,物理寻址*/
+#define DIAG_ID_Tx                0x0113            /*发送ID*/
+#define DIAG_ID_Rx_PHY            0x0112            /*接收ID,物理寻址*/
 #define DIAG_ID_Rx_FUN            0x0111            /*接收ID,功能寻址*/
 
 #endif
\ No newline at end of file

source/Driver/CAN/RSCAN_Table.c

@@ -41,5 +41,7 @@ const RSCANFD_Filter_st_t CANFD_RX_RULE_TABLE_LIST[CANFD0_RX_RULE_SIZE] =
     {0x98DBFFFAul, 0xDFFFFFFFUL, 0x80000000ul, CANFD0_CH0_RX_SELECT},/*24*/
 
     {0x000007E8ul, 0xDFFFFFFFUL, 0x80000000ul, CANFD0_CH2_RX_SELECT},/* 1*/
-    //{0x00000111ul, 0xDFFFFFFFUL, 0x80000000ul, CANFD0_CH2_RX_SELECT},/* 2*/
+
+    {0x00000111ul, 0xDFFFFFFFUL, 0x80000000ul, CANFD0_CH2_RX_SELECT},/* 2*/
+    {0x00000112ul, 0xDFFFFFFFUL, 0x80000000ul, CANFD0_CH2_RX_SELECT},/* 3*/
 };
\ No newline at end of file

source/Driver/CAN/RSCAN_Table.h

@@ -8,12 +8,12 @@
 /* structure */
 typedef struct
 {
-  uint32_t data[4];
+    uint32_t data[4];
 } RSCANFD_Filter_st_t;
 
 #define CANFD0_CH0_RX_RULE_SIZE 24u
 #define CANFD0_CH1_RX_RULE_SIZE 0U
-#define CANFD0_CH2_RX_RULE_SIZE 1U
+#define CANFD0_CH2_RX_RULE_SIZE 3U
 
 
 #define CANFD0_RX_RULE_SIZE (CANFD0_CH0_RX_RULE_SIZE + \