From c1e6196d3da930a82f12313bce04205b3488f7f1 Mon Sep 17 00:00:00 2001
From: WXK <287788329@qq.com>
Date: 星期日, 24 三月 2024 09:22:59 +0800
Subject: [PATCH] Merge branch '免布线标签-lora-泰斗GPS' of http://47.108.70.204:60062/r/XRange_Tag into 免布线标签-lora-泰斗GPS
---
MDK-ARM/L051/L051.build_log.htm | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/MDK-ARM/L051/L051.build_log.htm b/MDK-ARM/L051/L051.build_log.htm
index 9e0949c..ac0abce 100644
--- a/MDK-ARM/L051/L051.build_log.htm
+++ b/MDK-ARM/L051/L051.build_log.htm
@@ -21,13 +21,19 @@
Dialog DLL: TARMCM1.DLL V1.14.2.0
<h2>Project:</h2>
+<<<<<<< HEAD
C:\git\XRange_Tag -Lora-R - GPS\MDK-ARM\L051.uvprojx
Project File Date: 03/21/2024
+=======
+E:\GIT\XRange_Tag\MDK-ARM\L051.uvprojx
+Project File Date: 03/22/2024
+>>>>>>> 0401ba0353be795d83dad129a942d892c7f13eb5
<h2>Output:</h2>
*** Using Compiler 'V5.06 update 6 (build 750)', folder: 'C:\Keil_v5\ARM\ARMCC\Bin'
Build target 'L051'
Note: source file '..\Src\radio\crc.c' - object file renamed from 'L051\crc.o' to 'L051\crc_1.o'.
+<<<<<<< HEAD
compiling Lora.c...
../Src/OnChipDevices/Flash.h(3): warning: #47-D: incompatible redefinition of macro "FLASH_SIZE" (declared at line 125 of "../Drivers/STM32L0xx_HAL_Driver/Inc/stm32l0xx_hal_flash.h")
#define FLASH_SIZE (uint32_t)0x10000
@@ -44,6 +50,9 @@
Program Size: Code=30088 RO-data=684 RW-data=696 ZI-data=7416
FromELF: creating hex file...
"L051\L051.axf" - 0 Error(s), 5 Warning(s).
+=======
+"L051\L051.axf" - 0 Error(s), 0 Warning(s).
+>>>>>>> 0401ba0353be795d83dad129a942d892c7f13eb5
<h2>Software Packages used:</h2>
@@ -65,8 +74,13 @@
<h2>Collection of Component Files used:</h2>
+<<<<<<< HEAD
* Component: ARM::CMSIS:CORE:5.4.0
Build Time Elapsed: 00:00:02
+=======
+ * Component: ARM::CMSIS:CORE:5.5.0
+Build Time Elapsed: 00:00:00
+>>>>>>> 0401ba0353be795d83dad129a942d892c7f13eb5
</pre>
</body>
</html>
--
Gitblit v1.9.3