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 | 101 ++++++++++++++++++++++++--------------------------
1 files changed, 49 insertions(+), 52 deletions(-)
diff --git a/MDK-ARM/L051/L051.build_log.htm b/MDK-ARM/L051/L051.build_log.htm
index 75a80aa..ac0abce 100644
--- a/MDK-ARM/L051/L051.build_log.htm
+++ b/MDK-ARM/L051/L051.build_log.htm
@@ -3,87 +3,84 @@
<pre>
<h1>礦ision Build Log</h1>
<h2>Tool Versions:</h2>
-IDE-Version: μVision V5.29.0.0
-Copyright (C) 2019 ARM Ltd and ARM Germany GmbH. All rights reserved.
-License Information: ZHONG zhyinch@gmail.com, 111, LIC=YA39H-WXRJ4-KP5ZY-I1QRU-P01Q4-JRNSV
+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
Tool Versions:
-Toolchain: MDK-ARM Plus Version: 5.29.0.0
-Toolchain Path: D:\Keil_v5\ARM\ARMCC\Bin
+Toolchain: MDK-ARM Plus Version: 5.30.0.0
+Toolchain Path: C:\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)
Library Manager: ArmAr.exe V5.06 update 6 (build 750)
Hex Converter: FromElf.exe V5.06 update 6 (build 750)
-CPU DLL: SARMCM3.DLL V5.29.0.0
-Dialog DLL: DARMCM1.DLL V1.19.2.0
-Target DLL: Segger\JL2CM3.dll V2.99.36.0
-Dialog DLL: TARMCM1.DLL V1.14.1.0
+CPU DLL: SARMCM3.DLL V5.30.0.0
+Dialog DLL: DARMCM1.DLL V1.19.3.0
+Target DLL: Segger\JL2CM3.dll V2.99.38.0
+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: 01/10/2023
+Project File Date: 03/22/2024
+>>>>>>> 0401ba0353be795d83dad129a942d892c7f13eb5
<h2>Output:</h2>
-*** Using Compiler 'V5.06 update 6 (build 750)', folder: 'D:\Keil_v5\ARM\ARMCC\Bin'
+*** Using Compiler 'V5.06 update 6 (build 750)', folder: 'C:\Keil_v5\ARM\ARMCC\Bin'
Build target 'L051'
-compiling CRC.c...
-..\Src\application\CRC.c(44): warning: #1-D: last line of file ends without a newline
- }
-..\Src\application\CRC.c: 1 warning, 0 errors
-compiling dw_app.c...
-..\Src\application\dw_app.c(255): warning: #940-D: missing return statement at end of non-void function "FindNearBasePos"
- }
-..\Src\application\dw_app.c(263): warning: #223-D: function "Get_ADC_Value" declared implicitly
- temp_adc=Get_ADC_Value();
-..\Src\application\dw_app.c(600): warning: #223-D: function "delay_ms" declared implicitly
- delay_ms(100);
-..\Src\application\dw_app.c(307): warning: #177-D: variable "start_poll" was declared but never referenced
- u32 start_poll;
-..\Src\application\dw_app.c(308): warning: #177-D: variable "getsync_flag" was declared but never referenced
- u8 i,j,getsync_flag=0,timeout;
-..\Src\application\dw_app.c(611): warning: #177-D: variable "start_poll" was declared but never referenced
- u32 start_poll,frame_len;
-..\Src\application\dw_app.c(686): warning: #223-D: function "Get_VDDVlotage" declared implicitly
- bat_percent=Get_VDDVlotage();
-..\Src\application\dw_app.c(105): warning: #177-D: variable "poll_rx_ts" was declared but never referenced
- static uint64_t poll_rx_ts;
-..\Src\application\dw_app.c(106): warning: #177-D: variable "resp_tx_ts" was declared but never referenced
- static uint64_t resp_tx_ts;
-..\Src\application\dw_app.c(107): warning: #177-D: variable "final_rx_ts" was declared but never referenced
- static uint64_t final_rx_ts;
-..\Src\application\dw_app.c(108): warning: #177-D: variable "tof" was declared but never referenced
- static double tof;
-..\Src\application\dw_app.c(159): warning: #177-D: function "final_msg_get_ts" was declared but never referenced
- static void final_msg_get_ts(const uint8_t *ts_field, uint32_t *ts)
-..\Src\application\dw_app.c: 12 warnings, 0 errors
+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
+..\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
+ delay_ms(200);
+..\Src\radio\Lora.c(421): 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
+ static uint16_t current_count1,target_count1,end_count1,start_count1;
+..\Src\radio\Lora.c: 5 warnings, 0 errors
linking...
-Program Size: Code=20988 RO-data=908 RW-data=280 ZI-data=6560
+Program Size: Code=30088 RO-data=684 RW-data=696 ZI-data=7416
FromELF: creating hex file...
-"L051\L051.axf" - 0 Error(s), 13 Warning(s).
+"L051\L051.axf" - 0 Error(s), 5 Warning(s).
+=======
+"L051\L051.axf" - 0 Error(s), 0 Warning(s).
+>>>>>>> 0401ba0353be795d83dad129a942d892c7f13eb5
<h2>Software Packages used:</h2>
Package Vendor: ARM
- 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
+ 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
Package Vendor: Keil
- http://www.keil.com/pack/Keil.STM32L0xx_DFP.2.1.0.pack
- Keil.STM32L0xx_DFP.2.1.0
+ http://www.keil.com/pack/Keil.STM32L0xx_DFP.2.2.0.pack
+ Keil.STM32L0xx_DFP.2.2.0
STMicroelectronics STM32L0 Series Device Support, Drivers and Examples
<h2>Collection of Component include folders:</h2>
.\RTE\_L051
- 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
+ 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
<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:01
+Build Time Elapsed: 00:00:00
+>>>>>>> 0401ba0353be795d83dad129a942d892c7f13eb5
</pre>
</body>
</html>
--
Gitblit v1.9.3