修改流控帧BUG

source/Application/APP/Key/Key_user.c

@@ -1318,18 +1318,22 @@ void Key_Operation_ODOTrip(Key_Event_en_t enKeyEvent)
         {
 
         }
-        else if (User_set_Num.Trip_Type == 0u)
+        else if (User_set_Num.Trip_Type == TRAPA)
         {
-            User_set_Num.Trip_Type = 1u;
+            User_set_Num.Trip_Type = TRAPB;
+        }
+        else if (User_set_Num.Trip_Type == TRAPB)
+        {
+            User_set_Num.Trip_Type = TRAPA;
         }
         else
         {
-            User_set_Num.Trip_Type = 0u;
+            ;/*Do Nothing !*/
         }
     }
     else if (enKeyEvent == KEY_EVENT_LONG_PRESS)
     {
-        if (User_set_Num.Trip_Type == 0u)
+        if (User_set_Num.Trip_Type == TRAPA)
         {
             Data_Clear_Trip(EM_TRIP_A);
         }

source/Application/Graphic/GUI/GUI.h

@@ -6,8 +6,8 @@
 #include "images.h"
 #include "TYW_stdint.h"
 
-#define TRAPA 0u
-#define TRAPB 1u
+#define TRAPA 1u
+#define TRAPB 0u
 
 #define Language_En 0u
 #define Language_Cn 1u

source/Application/UDS_M/TP_Layer.c

@@ -649,20 +649,21 @@ void TP_TransmitPDU(void)
 
         //g_bReturn = bsp_CANSendFrame(g_txCanMsg.id, txResNum, (uint8_t *)&g_txCanMsg.msg[0], 8);
 
-        canMag.MsgID  = g_txCanMsg.id;
+        /*重新赋值----20220326----*/
+        canMag.MsgID  = 0x7E0u;//g_txCanMsg.id;
         canMag.MsgDLC = 8u;
         canMag.MsgPro = 0u;
         canMag.MsgStd = 0u;
         canMag.MsgRTR = 0u;
 
         canMag.Msg[0u] = g_txCanMsg.msg[0u];
-        canMag.Msg[1u] = g_txCanMsg.msg[1u];
+        canMag.Msg[1u] = 0x00u;//g_txCanMsg.msg[1u];
         canMag.Msg[2u] = g_txCanMsg.msg[2u];
-        canMag.Msg[3u] = g_txCanMsg.msg[3u];
-        canMag.Msg[4u] = g_txCanMsg.msg[4u];
-        canMag.Msg[5u] = g_txCanMsg.msg[5u];
-        canMag.Msg[6u] = g_txCanMsg.msg[6u];
-        canMag.Msg[7u] = g_txCanMsg.msg[7u];
+        canMag.Msg[3u] = 0x55u;//g_txCanMsg.msg[3u];
+        canMag.Msg[4u] = 0x55u;//g_txCanMsg.msg[4u];
+        canMag.Msg[5u] = 0x55u;//g_txCanMsg.msg[5u];
+        canMag.Msg[6u] = 0x55u;//g_txCanMsg.msg[6u];
+        canMag.Msg[7u] = 0x55u;//g_txCanMsg.msg[7u];
 
         g_bReturn = Can_Write(&canMag);
     }

source/System/tasks.c

@@ -86,6 +86,7 @@
 
 #include "Buzzer.h"
 #include "CAN_FUNC.h"
+#include "app_Service.h"
 
 #include "kwp2000_tp.h"
 #include "kwp2000_protocol.h"
@@ -111,6 +112,7 @@ void Sys_Run_Mode_Pseudo_Real_Time_Tasks(void)
     UDS_Server_Application_Service();
     IS31_Service();
     BU98R10_Update_Service();
+    Diagnosis_main();
 
 }
 /*============================================================================*/