From b6290b94cac76a5634cd90b495b65d91ee92d85e Mon Sep 17 00:00:00 2001
From: QuakeGod <QuakeGod@sina.com>
Date: 星期三, 22 二月 2023 08:57:38 +0800
Subject: [PATCH] fix conflict
---
MDK-ARM/JLinkLog.txt | 36 ++++++++++++++++++++++++++++++++++++
1 files changed, 36 insertions(+), 0 deletions(-)
diff --git a/MDK-ARM/JLinkLog.txt b/MDK-ARM/JLinkLog.txt
index 339eed8..a156490 100644
--- a/MDK-ARM/JLinkLog.txt
+++ b/MDK-ARM/JLinkLog.txt
@@ -1,4 +1,39 @@
+<<<<<<< HEAD
+T11F0 000:622 SEGGER J-Link V6.10i Log File (0001ms, 0065ms total)
+T11F0 000:622 DLL Compiled: Oct 25 2016 19:31:51 (0002ms, 0066ms total)
+T11F0 000:622 Logging started @ 2022-12-13 18:37 (0002ms, 0066ms total)
+T11F0 000:624 JLINK_SetWarnOutHandler(...) (0000ms, 0066ms total)
+T11F0 000:624 JLINK_OpenEx(...)
+Firmware: J-Link OB-STM32F072-CortexM compiled Sep 26 2016 10:03:56
+Hardware: V1.00
+Feature(s): GDB, RDI, FlashBP, FlashDL, JFlash, RDDIWEBSRV Webserver running on local port 19080 (0059ms, 0125ms total)
+T11F0 000:624 returns O.K. (0059ms, 0125ms total)
+T11F0 000:683 JLINK_SetErrorOutHandler(...) (0000ms, 0125ms total)
+T11F0 000:683 JLINK_ExecCommand("ProjectFile = "D:\WORK\MCU&PCB\DIST_IO\F030C8T6_FP0\MDK-ARM\JLinkSettings.ini"", ...). Device "CORTEX-M0" selected. returns 0x00 (0170ms, 0295ms total)
+T11F0 000:853 JLINK_ExecCommand("Device = STM32F030C8Tx", ...). Device "CORTEX-M0" selected. returns 0x00 (0018ms, 0313ms total)
+T11F0 000:871 JLINK_ExecCommand("DisableConnectionTimeout", ...). returns 0x01 (0000ms, 0313ms total)
+T11F0 000:871 JLINK_GetHardwareVersion() returns 0x2710 (0000ms, 0313ms total)
+T11F0 000:871 JLINK_GetDLLVersion() returns 61009 (0000ms, 0313ms total)
+T11F0 000:871 JLINK_GetFirmwareString(...) (0000ms, 0313ms total)
+T11F0 000:871 JLINK_GetDLLVersion() returns 61009 (0000ms, 0313ms total)
+T11F0 000:871 JLINK_GetCompileDateTime() (0000ms, 0313ms total)
+T11F0 000:871 JLINK_GetFirmwareString(...) (0000ms, 0313ms total)
+T11F0 000:871 JLINK_GetHardwareVersion() returns 0x2710 (0000ms, 0313ms total)
+T11F0 000:871 JLINK_TIF_Select(JLINKARM_TIF_SWD) returns 0x00 (0001ms, 0314ms total)
+T11F0 000:872 JLINK_SetSpeed(5000) (0001ms, 0315ms total)
+T11F0 000:873 JLINK_SetResetType(JLINKARM_RESET_TYPE_NORMAL) returns JLINKARM_RESET_TYPE_NORMAL (0000ms, 0315ms total)
+T11F0 000:873 JLINK_Reset() >0x108 TIF>Found SWD-DP with ID 0x2BA01477 >0x0D TIF> >0x28 TIF> >0x0D TIF> >0x28 TIF> >0x0D TIF> >0x28 TIF> >0x0D TIF> >0x28 TIF> >0x0D TIF> >0x21 TIF> >0x0D TIF> >0x28 TIF> >0x0D TIF> >0x28 TIF> >0x0D TIF> >0x21 TIF> >0x0D TIF> >0x21 TIF> >0x0D TIF> >0x21 TIF>AP-IDR: 0x24770011, Type: AHB-AP >0x0D TIF> >0x28 TIF> >0x0D TIF> >0x28 TIF> >0x0D TIF> >0x28 TIF> >0x0D TIF> >0x21 TIF> >0x0D TIF> >0x21 TIF> >0x0D TIF> >0x28 TIF> >0x0D TIF> >0x21 TIF> >0x0D TIF> >0x21 TIF>
+Found Cortex-M4 r0p1, Little endian.Identified core does not match configuration. (Found: Cortex-M4, Configured: Cortex-M0) -- CPU_ReadMem(4 bytes @ 0xE000EDF0) -- CPU_ReadMem(4 bytes @ 0xE0002000)FPUnit: 6 code (BP) slots and 2 literal slots -- CPU_ReadMem(4 bytes @ 0xE000EDFC) -- CPU_WriteMem(4 bytes @ 0xE000EDFC) -- CPU_ReadMem(4 bytes @ 0xE0001000) -- CPU_WriteMem(4 bytes @ 0xE0001000) -- CPU_ReadMem(4 bytes @ 0xE000ED88) -- CPU_WriteMem(4 bytes @ 0xE000ED88) -- CPU_ReadMem(4 bytes @ 0xE000ED88)
+ -- CPU_WriteMem(4 bytes @ 0xE000ED88)CoreSight components:ROMTbl 0 @ E00FF000 -- CPU_ReadMem(16 bytes @ 0xE00FF000) -- CPU_ReadMem(16 bytes @ 0xE000EFF0) -- CPU_ReadMem(16 bytes @ 0xE000EFE0)ROMTbl 0 [0]: FFF0F000, CID: B105E00D, PID: 000BB00C SCS -- CPU_ReadMem(16 bytes @ 0xE0001FF0) -- CPU_ReadMem(16 bytes @ 0xE0001FE0)ROMTbl 0 [1]: FFF02000, CID: B105E00D, PID: 003BB002 DWT -- CPU_ReadMem(16 bytes @ 0xE0002FF0) -- CPU_ReadMem(16 bytes @ 0xE0002FE0)
+ROMTbl 0 [2]: FFF03000, CID: B105E00D, PID: 002BB003 FPB -- CPU_ReadMem(16 bytes @ 0xE0000FF0) -- CPU_ReadMem(16 bytes @ 0xE0000FE0)ROMTbl 0 [3]: FFF01000, CID: B105E00D, PID: 003BB001 ITM -- CPU_ReadMem(16 bytes @ 0xE00FF010) -- CPU_ReadMem(16 bytes @ 0xE0040FF0) -- CPU_ReadMem(16 bytes @ 0xE0040FE0)ROMTbl 0 [4]: FFF41000, CID: B105900D, PID: 000BB9A1 TPIU -- CPU is running -- CPU_WriteMem(4 bytes @ 0xE000EDF0) -- CPU is running -- CPU_WriteMem(4 bytes @ 0xE000EDFC) >0x35 TIF> -- CPU is running
+ -- CPU_WriteMem(4 bytes @ 0xE000ED0C) -- CPU is running -- CPU_ReadMem(4 bytes @ 0xE000EDF0) -- CPU is running -- CPU_ReadMem(4 bytes @ 0xE000EDF0) -- CPU is running -- CPU_WriteMem(4 bytes @ 0xE000EDF0) -- CPU is running -- CPU_WriteMem(4 bytes @ 0xE000EDFC) -- CPU is running -- CPU_ReadMem(4 bytes @ 0xE000EDF0) -- CPU_WriteMem(4 bytes @ 0xE0002000) -- CPU_ReadMem(4 bytes @ 0xE000EDFC) -- CPU_ReadMem(4 bytes @ 0xE0001000) (0047ms, 0362ms total)
+T11F0 000:920 JLINK_GetId() >0x0D TIF> >0x21 TIF> returns 0x2BA01477 (0001ms, 0363ms total)
+T11F0 000:937 JLINK_GetFirmwareString(...) (0000ms, 0363ms total)
+T11F0 020:597 JLINK_Close() -- CPU_ReadMem(4 bytes @ 0xE0001000) -- CPU_WriteMem(4 bytes @ 0xE0001004) >0x0D TIF> >0x28 TIF> >0x0D TIF> >0x28 TIF> >0x0D TIF> >0x28 TIF> >0x0D TIF> >0x28 TIF> >0x0D TIF> >0x28 TIF> >0x0D TIF> >0x28 TIF> >0x0D TIF> >0x28 TIF> >0x0D TIF> >0x28 TIF> >0x0D TIF> >0x21 TIF> >0x0D TIF> >0x28 TIF> (0026ms, 0389ms total)
+T11F0 020:597 (0026ms, 0389ms total)
+T11F0 020:597 Closed (0026ms, 0389ms total)
+=======
T6644 000:240 SEGGER J-Link V6.10i Log File (0002ms, 0050ms total)
T6644 000:240 DLL Compiled: Oct 25 2016 19:31:51 (0002ms, 0050ms total)
T6644 000:240 Logging started @ 2022-10-17 19:04 (0002ms, 0050ms total)
@@ -2425,3 +2460,4 @@
T6644 004:159 JLINK_Close() -- CPU is running -- CPU_WriteMem(4 bytes @ 0xE0002008) -- CPU is running -- CPU_WriteMem(4 bytes @ 0xE000200C) -- CPU is running -- CPU_WriteMem(4 bytes @ 0xE0002010) -- CPU is running -- CPU_WriteMem(4 bytes @ 0xE0002014) >0x0D TIF> >0x28 TIF> >0x0D TIF> >0x28 TIF> >0x0D TIF> >0x28 TIF> >0x0D TIF> >0x28 TIF> >0x0D TIF> >0x28 TIF> >0x0D TIF> >0x28 TIF> >0x0D TIF> >0x28 TIF> >0x0D TIF> >0x28 TIF> >0x0D TIF> >0x21 TIF> >0x0D TIF> >0x28 TIF> (0021ms, 1230ms total)
T6644 004:159 (0021ms, 1230ms total)
T6644 004:159 Closed (0021ms, 1230ms total)
+>>>>>>> 83de2a69af869f4e5c0462a50255317fb9e37099
--
Gitblit v1.9.1