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 | 80 ++++++++++++++++++++--------------------
1 files changed, 40 insertions(+), 40 deletions(-)
diff --git a/MDK-ARM/L051/L051.build_log.htm b/MDK-ARM/L051/L051.build_log.htm
index 330a89e..7584a37 100644
--- a/MDK-ARM/L051/L051.build_log.htm
+++ b/MDK-ARM/L051/L051.build_log.htm
@@ -3,64 +3,64 @@
<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.
+IDE-Version: μVision V5.30.0.0
+Copyright (C) 2020 ARM Ltd and ARM Germany GmbH. All rights reserved.
License Information: ZHONG zhyinch@gmail.com, 111, LIC=YA39H-WXRJ4-KP5ZY-I1QRU-P01Q4-JRNSV
Tool Versions:
-Toolchain: MDK-ARM Plus Version: 5.29.0.0
+Toolchain: MDK-ARM Plus Version: 5.30.0.0
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)
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: CMSIS_AGDI.dll V1.32.0.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>
-E:\GIT\XRange_Tag - 副本\MDK-ARM\L051.uvprojx
-Project File Date: 05/25/2023
+<<<<<<< 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'
-compiling main.c...
-..\Drivers\ExternlDrivers\lis3dh_driver.h(67): warning: #1295-D: Deprecated declaration LIS3DH_ENTER_STY_Init - give arg types
- void LIS3DH_ENTER_STY_Init();
-..\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")
+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/main.c(117): warning: #177-D: variable "current_time" was declared but never referenced
- {u16 current_time;
-../Src/main.c(161): warning: #177-D: variable "lptime" was declared but never referenced
- int32_t lpcount,lptime,target_time;
-../Src/main.c(161): warning: #177-D: variable "target_time" was declared but never referenced
- int32_t lpcount,lptime,target_time;
-../Src/main.c(261): warning: #186-D: pointless comparison of unsigned integer with zero
- if(module_power<0)
-../Src/main.c(271): warning: #223-D: function "printf" declared implicitly
- printf("固件版本: 免布线基站 V%d.%d. \r\n",g_com_map[VERSION]>>8,g_com_map[VERSION]&0xff);
-../Src/main.c(212): warning: #177-D: variable "temp" was declared but never referenced
- { float temp;
-../Src/main.c(213): warning: #177-D: variable "temp2" was declared but never referenced
- uint16_t temp2;
-../Src/main.c(214): warning: #177-D: variable "i" was declared but never referenced
- uint16_t i;
-../Src/main.c(313): warning: #177-D: variable "bat_count" was declared but never referenced
- static uint16_t bat_count = 0;
-../Src/main.c(400): warning: #177-D: variable "blink_count" was declared but never referenced
- { static uint16_t blink_count=0;
-../Src/main.c(745): warning: #223-D: function "Usart1InitVariables" declared implicitly
- Usart1InitVariables();
-../Src/main.c(278): warning: #177-D: function "SystemPower_Config" was declared but never referenced
- static void SystemPower_Config(void)
-../Src/main.c: 14 warnings, 0 errors
+..\Src\radio\Lora.c(20): warning: #1295-D: Deprecated declaration LoraUp_Poll - give arg types
+ void LoraUp_Poll();
+..\Src\radio\Lora.c(475): warning: #223-D: function "delay_ms" declared implicitly
+ delay_ms(200);
+..\Src\radio\Lora.c(459): warning: #177-D: variable "result" was declared but never referenced
+ { uint16_t result ;
+..\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=21316 RO-data=908 RW-data=308 ZI-data=6828
+Program Size: Code=30116 RO-data=684 RW-data=692 ZI-data=7420
FromELF: creating hex file...
-"L051\L051.axf" - 0 Error(s), 14 Warning(s).
+"L051\L051.axf" - 0 Error(s), 9 Warning(s).
+>>>>>>> c8cbb8205d69b4120122a7d0923edcca611399ef
<h2>Software Packages used:</h2>
--
Gitblit v1.9.3