调整胎压匹配握手逻辑

source/Application/CAN_APP_NM/CAN_App/CAN_FUNC.c

@@ -24,6 +24,7 @@ static uint8_t User_BCM_Flag;
 uint8_t TpmsMsg18033317SendFlag = 0;
 
 uint8_t Msg_18021733[8];
+static uint8_t TXNum_18033317;
 /*---------------------------------------------------------------------------
 使用しない Byte、bit に関しては全て 1(B)をセットして出力すること
 对于不使用的Byte、bit，全部设置1(B)并输出
@@ -560,6 +561,8 @@ void Can_Set_Buff_18033317(uint8_t CopyData[])
 {
     uint8_t Pair_cmd = 0u;
 
+    Common_SetTXNum_18033317();
+
     if (User_set_Num.User_TpmsStatus == 2)
     {
         CopyData[0] = 0x61u;
@@ -605,7 +608,7 @@ void Can_Set_Buff_18033317(uint8_t CopyData[])
             break   ;
         }
     }
-    else
+    else if (User_set_Num.User_TpmsStatus == 1)
     {
         CopyData[0] = 0x91;                        /* 1  */
         CopyData[1] = 0u;                          /* 2  */
@@ -617,14 +620,15 @@ void Can_Set_Buff_18033317(uint8_t CopyData[])
     CopyData[5] = 0u;                          /* 6  */
     CopyData[6] = 0u;                          /* 7  */
     CopyData[7] = 0u;                          /* 8  */
-
-    User_set_Num.User_TpmsSend = 0u;
 }
 void Id18033317_Send_Service(void)
 {
     if (User_set_Num.User_TpmsSend == 3u)
     {
         Can_Msg_Tx_Overwrite(MSGID_18033317, 3u, 50 * 1000);
+
+        User_set_Num.User_TpmsSend = 0u;
+        TXNum_18033317 = 0u;
     }
 }
 /*-------------------------------------------------------------------------
@@ -997,7 +1001,7 @@ void Drive_Info_IC3_STATUS_Rx(void)
 
         Msg_18021733[0] = 0;
 
-        if ((User_set_Num.User_TpmsStatus == 2) && (User_set_Num.User_TpmsSend == 0))
+        if ((User_set_Num.User_TpmsStatus == 2) && (Common_GetTXNum_18033317() >= 3u))
         {
             switch (User_set_Num.User_Tpms)
             {
@@ -1070,6 +1074,7 @@ void Drive_Info_IC3_STATUS_Rx(void)
 void MSG_18021733_REC_COPY(uint8_t copy[])
 {
     uint8_t i = 0u;
+
     for (i = 0u; i < 8u; i++)
     {
         Msg_18021733[i] = copy[i];
@@ -1126,3 +1131,12 @@ uint32_t Common_Data_Get_TripB_Average_Speed(void)
 {
     return User_ECU.TripB_Average_Speed;
 }
+
+void Common_SetTXNum_18033317(void)
+{
+    TXNum_18033317 ++;
+}
+uint8_t Common_GetTXNum_18033317(void)
+{
+    return TXNum_18033317;
+}
\ No newline at end of file

source/Application/CAN_APP_NM/CAN_App/CAN_FUNC.h

@@ -56,9 +56,13 @@ uint32_t Common_Data_Get_TripA_Average_Speed(void);
 uint32_t Common_Data_Get_TripB_Fuel(void);
 uint32_t Common_Data_Get_TripB_Average_Speed(void);
 
+void Common_SetTXNum_18033317(void);
+uint8_t Common_GetTXNum_18033317(void);
+
 void Id18EF1817_Send_Service(void);
 void Id18033317_Send_Service(void);
 
 void MSG_18021733_REC_COPY(uint8_t copy[]);
 
+
 #endif
\ No newline at end of file