🐛 1. 修复无法延迟跳转的问题，使用看门狗复位的方式实现

Signed-off-by: DAVE <[email protected]>
SummerFalls · May 25, 2021 · b73ebbf · b73ebbf
1 parent fa7a572
commit b73ebbf
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/UDS_PortingFiles/includes.h b/UDS_PortingFiles/includes.h
@@ -34,9 +34,7 @@
 #define __PROJECT_COMPILE_DATE_TIME__   __DATE__" - "__TIME__
 
 /* ASSERT and DEBUG IO/TIMER */
-#if defined (EN_ASSERT) || defined (EN_DEBUG_TIMER) || defined (EN_DEBUG_PRINT) || defined (EN_DEBUG_IO)
 #include "bootloader_debug.h"
-#endif
 
 #ifdef EN_ASSERT
 #define ASSERT(xValue)\

diff --git a/UDS_ProtocolStack/bootloader_main.c b/UDS_ProtocolStack/bootloader_main.c
@@ -29,11 +29,12 @@ void UDS_MAIN_Init(void (*pfBSP_Init)(void), void (*pfAbortTxMsg)(void))
         Boot_PowerONClearAllFlag();
     }
 
-#ifndef EN_DELAY_TIME
-
-    Boot_JumpToAppOrNot();
-
+#ifdef EN_DELAY_TIME
+    if (TRUE == POWER_SYS_GetResetSrcStatusCmd(RCM, RCM_WATCH_DOG))
 #endif
+    {
+        Boot_JumpToAppOrNot();
+    }
 
 #endif
 

diff --git a/UDS_ProtocolStack/uds_app_cfg.c b/UDS_ProtocolStack/uds_app_cfg.c
@@ -1357,7 +1357,7 @@ void UDS_SystemTickCtl(void)
         }
         else
         {
-            Boot_JumpToAppOrNot();
+            DoResetMCU(TX_MSG_SUCCESSFUL);
         }
     }