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 | 55 ++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 36 insertions(+), 19 deletions(-)
diff --git a/MDK-ARM/L051/L051.build_log.htm b/MDK-ARM/L051/L051.build_log.htm
index 9e0949c..7584a37 100644
--- a/MDK-ARM/L051/L051.build_log.htm
+++ b/MDK-ARM/L051/L051.build_log.htm
@@ -5,11 +5,11 @@
<h2>Tool Versions:</h2>
IDE-Version: μVision V5.30.0.0
Copyright (C) 2020 ARM Ltd and ARM Germany GmbH. All rights reserved.
-License Information: WXK WXK, WXK, LIC=LSNXV-PQMLL-2Z8W4-FC0XG-4GU90-PI7N8
+License Information: ZHONG zhyinch@gmail.com, 111, LIC=YA39H-WXRJ4-KP5ZY-I1QRU-P01Q4-JRNSV
Tool Versions:
Toolchain: MDK-ARM Plus Version: 5.30.0.0
-Toolchain Path: C:\Keil_v5\ARM\ARMCC\Bin
+Toolchain Path: D:\Keil_v5\ARM\ARMCC\Bin
C Compiler: Armcc.exe V5.06 update 6 (build 750)
Assembler: Armasm.exe V5.06 update 6 (build 750)
Linker/Locator: ArmLink.exe V5.06 update 6 (build 750)
@@ -21,51 +21,68 @@
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
+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: 'C:\Keil_v5\ARM\ARMCC\Bin'
+*** 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();
+..\Src\radio\Lora.h(46): warning: #1295-D: Deprecated declaration LoraUp_Poll - give arg types
+ void LoraUp_Poll();
+../Src/radio/lora.h(46): warning: #1-D: last line of file ends without a newline
+ void LoraUp_Poll();
+../Src/radio/lora.h(46): warning: #1295-D: Deprecated declaration LoraUp_Poll - give arg types
+ void LoraUp_Poll();
../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
..\Src\radio\Lora.c(20): warning: #1295-D: Deprecated declaration LoraUp_Poll - give arg types
void LoraUp_Poll();
-..\Src\radio\Lora.c(441): 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(421): 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(413): 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: 5 warnings, 0 errors
+..\Src\radio\Lora.c: 9 warnings, 0 errors
linking...
-Program Size: Code=30088 RO-data=684 RW-data=696 ZI-data=7416
+Program Size: Code=30116 RO-data=684 RW-data=692 ZI-data=7420
FromELF: creating hex file...
-"L051\L051.axf" - 0 Error(s), 5 Warning(s).
+"L051\L051.axf" - 0 Error(s), 9 Warning(s).
+>>>>>>> c8cbb8205d69b4120122a7d0923edcca611399ef
<h2>Software Packages used:</h2>
Package Vendor: ARM
- http://www.keil.com/pack/ARM.CMSIS.5.7.0.pack
- ARM.CMSIS.5.7.0
- CMSIS (Cortex Microcontroller Software Interface Standard)
- * Component: CORE Version: 5.4.0
+ http://www.keil.com/pack/ARM.CMSIS.5.8.0.pack
+ ARM.CMSIS.5.8.0
+ CMSIS (Common Microcontroller Software Interface Standard)
+ * Component: CORE Version: 5.5.0
Package Vendor: Keil
- http://www.keil.com/pack/Keil.STM32L0xx_DFP.2.2.0.pack
- Keil.STM32L0xx_DFP.2.2.0
+ http://www.keil.com/pack/Keil.STM32L0xx_DFP.2.1.0.pack
+ Keil.STM32L0xx_DFP.2.1.0
STMicroelectronics STM32L0 Series Device Support, Drivers and Examples
<h2>Collection of Component include folders:</h2>
.\RTE\_L051
- C:\Keil_v5\ARM\PACK\ARM\CMSIS\5.7.0\CMSIS\Core\Include
- C:\Keil_v5\ARM\PACK\Keil\STM32L0xx_DFP\2.2.0\Drivers\CMSIS\Device\ST\STM32L0xx\Include
+ D:\Users\zhyin\AppData\Local\Arm\Packs\ARM\CMSIS\5.8.0\CMSIS\Core\Include
+ D:\Users\zhyin\AppData\Local\Arm\Packs\Keil\STM32L0xx_DFP\2.1.0\Drivers\CMSIS\Device\ST\STM32L0xx\Include
<h2>Collection of Component Files used:</h2>
- * Component: ARM::CMSIS:CORE:5.4.0
+ * Component: ARM::CMSIS:CORE:5.5.0
Build Time Elapsed: 00:00:02
</pre>
</body>
--
Gitblit v1.9.3