From 2b07faacf6d1ce3de7ace73af366e5b84e652c14 Mon Sep 17 00:00:00 2001
From: WXK <287788329@qq.com>
Date: 星期三, 13 十一月 2024 16:37:43 +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 | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/MDK-ARM/L051/L051.build_log.htm b/MDK-ARM/L051/L051.build_log.htm
index 522a381..7584a37 100644
--- a/MDK-ARM/L051/L051.build_log.htm
+++ b/MDK-ARM/L051/L051.build_log.htm
@@ -21,13 +21,21 @@
Dialog DLL: TARMCM1.DLL V1.14.2.0
<h2>Project:</h2>
-E:\GIT\XRange_Tag - 副本\MDK-ARM\L051.uvprojx
-Project File Date: 06/21/2024
+<<<<<<< HEAD
+C:\git\XRange_Tag -Lora-R - GPS\MDK-ARM\L051.uvprojx
+Project File Date: 11/12/2024
+=======
+E:\GIT\XRange_Tag\MDK-ARM\L051.uvprojx
+Project File Date: 10/29/2024
+>>>>>>> c8cbb8205d69b4120122a7d0923edcca611399ef
<h2>Output:</h2>
*** Using Compiler 'V5.06 update 6 (build 750)', folder: 'D:\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
+"L051\L051.axf" - 0 Error(s), 0 Warning(s).
+=======
compiling Lora.c...
..\Src\radio\Lora.h(46): warning: #1-D: last line of file ends without a newline
void LoraUp_Poll();
@@ -41,17 +49,18 @@
#define FLASH_SIZE (uint32_t)0x10000
..\Src\radio\Lora.c(20): warning: #1295-D: Deprecated declaration LoraUp_Poll - give arg types
void LoraUp_Poll();
-..\Src\radio\Lora.c(472): warning: #223-D: function "delay_ms" declared implicitly
+..\Src\radio\Lora.c(475): warning: #223-D: function "delay_ms" declared implicitly
delay_ms(200);
-..\Src\radio\Lora.c(456): warning: #177-D: variable "result" was declared but never referenced
+..\Src\radio\Lora.c(459): warning: #177-D: variable "result" was declared but never referenced
{ uint16_t result ;
-..\Src\radio\Lora.c(448): warning: #177-D: variable "target_count1" was declared but never referenced
+..\Src\radio\Lora.c(451): warning: #177-D: variable "target_count1" was declared but never referenced
static uint16_t current_count1,target_count1,end_count1,start_count1;
..\Src\radio\Lora.c: 9 warnings, 0 errors
linking...
-Program Size: Code=30292 RO-data=684 RW-data=700 ZI-data=7420
+Program Size: Code=30116 RO-data=684 RW-data=692 ZI-data=7420
FromELF: creating hex file...
"L051\L051.axf" - 0 Error(s), 9 Warning(s).
+>>>>>>> c8cbb8205d69b4120122a7d0923edcca611399ef
<h2>Software Packages used:</h2>
--
Gitblit v1.9.3