Skip to content

Commit 4745206

Browse files
committed
🐛 1. 修复无法延迟跳转的问题,使用看门狗复位的方式实现
Signed-off-by: DAVE <[email protected]>
1 parent 60b66e7 commit 4745206

File tree

3 files changed

+6
-7
lines changed

3 files changed

+6
-7
lines changed

UDS_PortingFiles/includes.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,7 @@
3434
#define __PROJECT_COMPILE_DATE_TIME__ __DATE__" - "__TIME__
3535

3636
/* ASSERT and DEBUG IO/TIMER */
37-
#if defined (EN_ASSERT) || defined (EN_DEBUG_TIMER) || defined (EN_DEBUG_PRINT) || defined (EN_DEBUG_IO)
3837
#include "bootloader_debug.h"
39-
#endif
4038

4139
#ifdef EN_ASSERT
4240
#define ASSERT(xValue)\

UDS_ProtocolStack/bootloader_main.c

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,12 @@ void UDS_MAIN_Init(void (*pfBSP_Init)(void), void (*pfAbortTxMsg)(void))
2929
Boot_PowerONClearAllFlag();
3030
}
3131

32-
#ifndef EN_DELAY_TIME
33-
34-
Boot_JumpToAppOrNot();
35-
32+
#ifdef EN_DELAY_TIME
33+
if (TRUE == POWER_SYS_GetResetSrcStatusCmd(RCM, RCM_WATCH_DOG))
3634
#endif
35+
{
36+
Boot_JumpToAppOrNot();
37+
}
3738

3839
#endif
3940

UDS_ProtocolStack/uds_app_cfg.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1357,7 +1357,7 @@ void UDS_SystemTickCtl(void)
13571357
}
13581358
else
13591359
{
1360-
Boot_JumpToAppOrNot();
1360+
DoResetMCU(TX_MSG_SUCCESSFUL);
13611361
}
13621362
}
13631363

0 commit comments

Comments
 (0)