Merge branch 'CHENJIALE' of http://tyw-server.synology.me:12345/ty/tianying_ty100 into lijianshuang

Firmware/Source/Application/CAN_User/Can_User.c

@@ -236,11 +236,39 @@ void COM_CAN_Init(void)
     Can_RX_BuffInit(&CAN_CH0_CanMsgOp, CAN_CH0_CAN_MSG_CONST_ARRAY, CAN_CH0_ID_TOTAL_MAX);
     CAN_RX_SetEnable(&CAN_CH0_CanMsgOp, CAN_N_RX_Enable);
 
+
+}
+
+
+void CAN_TX_Init(void)
+{
+
     memset(pTXBuff, 0, sizeof(pTXBuff));
     CAN_CH0_CanMsgTxOp.CanMsg = (st_CAN_SendOperation *)pTXBuff;
     Can_TX_BuffInit(&CAN_CH0_CanMsgTxOp, CAN_CH0_CANSendAttr, CAN_CH0_ID_SEND_TOTAL, COM_APP_Process);
     CAN_TX_SetEnable(&CAN_CH0_CanMsgTxOp, CAN_N_TX_Disable);
+
+
+
+
 }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 void Can_QuickTimer_Init(void)
 {
     uint32_t i = 0u;

Firmware/Source/Application/CAN_User/Can_User.h

@@ -31,7 +31,7 @@ typedef struct
 } RSCAN0BusoffMonitorStruct;
 
 
-
+extern void CAN_TX_Init(void);
 extern void Can_Tx_Apply_Buff(void);
 extern void Can_RX_Apply_Buff(void);
 extern void Can_BusOff_Recover(uint8_t deltaTime);

Firmware/Source/Application/Data_TPMS/Data_TPMS.c

@@ -357,7 +357,7 @@ void Data_TPMS_Processing_Service ( void )
     Front_TPMS          = Get_CAN_CH0_ID_341_Sig_Front_Pressure();
     Rear_TPMS           = Get_CAN_CH0_ID_341_Sig_Rear_Pressure();
 
-    if ( Common_Get_IG_Sts() == COMMON_POWER_ON )
+    if ( 1 )
     {
         if(CAN_MSG_Status(&CAN_CH0_CanMsgOp, CAN_CH0_ID_CAN_0x341_Msg_Count) == CAN_SIG_LOST)
         {

Firmware/Source/Component/PowerManagement/PowerManag_user.c

@@ -52,6 +52,20 @@ static void Power_KL30_Init(void)
 
     Data_TPMS_KL30_Init ();
     CAN_TX_Count_Init();
+    
+    CanMSg_XMS_Analysis(&CAN_CH0_CanMsgOp,2u);
+    CanMSg_XMS_Analysis(&CAN_CH0_CanMsgOp,2u);
+    CanMSg_XMS_Analysis(&CAN_CH0_CanMsgOp,2u);
+    Data_TPMS_Processing_Service();
+    CAN_TX_Init();
+
+
+
+
+
+
+
+
     CAN_TX_SetEnable(&CAN_CH0_CanMsgTxOp, CAN_N_TX_Enable);
     
     
@@ -97,8 +111,8 @@ static void Power_KL30_Init(void)
     RTE_RTC_Init(RTCInformation);
     RTE_DEEPSLEEP_GPIO_Interrupt_Enable(WAKEUP_KL15_In,Trigger_Rising);
     FaultCode_Init();
+// Data_TPMS_Processing_Service();
 
-    
 
 }
 extern uint32_t PowerIgnOffTimeLine;
@@ -109,7 +123,7 @@ static void Power_Wakeup_Init(void)
     Simulated_IIC_2_Init();
     Gpio_Init(Gpio_WakeUp_Init);
     Can_Init();
-    CAN_TX_SetEnable(&CAN_CH0_CanMsgTxOp, CAN_N_TX_Enable);
+
     DFlash_init();
     Data_Read_DiagPara();
     eeprom_StoreInfo_Init();
@@ -117,6 +131,20 @@ static void Power_Wakeup_Init(void)
     Data_User_Mileage_WakeupInit();
     BU98R10_Init();    
     Sys_WakeUp_Init();
+    Data_TPMS_KL15_WAKE_UP_Init();
+
+    CanMSg_XMS_Analysis(&CAN_CH0_CanMsgOp,2u);
+        CanMSg_XMS_Analysis(&CAN_CH0_CanMsgOp,2u);
+            CanMSg_XMS_Analysis(&CAN_CH0_CanMsgOp,2u);
+    Data_TPMS_Processing_Service();
+    CAN_TX_Init();
+
+    CAN_TX_Count_Init();
+    CAN_TX_SetEnable(&CAN_CH0_CanMsgTxOp, CAN_N_TX_Enable);
+
+
+
+
     Data_Vehicle_Speed_KL30_Init();
     Data_Vehicle_Speed_Wakeup_Init();
     Data_Engine_Speed_KL30_Wakeup_Init();
@@ -142,11 +170,11 @@ static void Power_Wakeup_Init(void)
     TimerM_PWM_CH_Output_init(TIMERM_COUNTER1, TIMERM_CHB, ActiveLevel_High);
     Telltales_Init();
     Telltales_UserInit();
-    Data_TPMS_KL15_WAKE_UP_Init();
+    
     RTE_DEEPSLEEP_GPIO_Interrupt_Enable(WAKEUP_KL15_In,Trigger_Rising);
     FaultCode_Init();
     Service_Interval_User_WakeupInit();
-    CAN_TX_Count_Init();
+
 }
 
 static void Power_LVP_Init(void)