From b5cf79a0523697b760579eeac2e3ac60af62c55c Mon Sep 17 00:00:00 2001
From: WXK <287788329@qq.com>
Date: 星期二, 29 四月 2025 18:06:35 +0800
Subject: [PATCH] Merge branch 'L051K8U6-SS定位-临近-防撞基站' of http://47.108.70.204:60062/r/XRange_Tag into L051K8U6-SS定位-临近-防撞基站
---
MDK-ARM/L051/L051.build_log.htm | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 58 insertions(+), 0 deletions(-)
diff --git a/MDK-ARM/L051/L051.build_log.htm b/MDK-ARM/L051/L051.build_log.htm
index 943e096..238b2f7 100644
--- a/MDK-ARM/L051/L051.build_log.htm
+++ b/MDK-ARM/L051/L051.build_log.htm
@@ -21,12 +21,69 @@
Dialog DLL: TARMCM1.DLL V1.14.2.0
<h2>Project:</h2>
+<<<<<<< HEAD
+C:\git\XRange_Tag -SS定位-临近 - 方庄基站\MDK-ARM\L051.uvprojx
+Project File Date: 04/29/2025
+=======
E:\GIT\XRange_Tag\MDK-ARM\L051.uvprojx
Project File Date: 04/19/2025
+>>>>>>> 266dcffc919008dedf2acc84f7f52a3aff83bf07
<h2>Output:</h2>
*** Using Compiler 'V5.06 update 6 (build 750)', folder: 'D:\Keil_v5\ARM\ARMCC\Bin'
Build target 'L051'
+<<<<<<< HEAD
+compiling main.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
+../Drivers/ExternlDrivers/lis3dh_driver.h(67): warning: #1295-D: Deprecated declaration LIS3DH_ENTER_STY_Init - give arg types
+ void LIS3DH_ENTER_STY_Init();
+../Drivers/ExternlDrivers/lis3dh_driver.h(69): warning: #1295-D: Deprecated declaration Accelerometer_Init - give arg types
+ void Accelerometer_Init();
+../Drivers/ExternlDrivers/lis3dh_driver.h(72): warning: #1295-D: Deprecated declaration do_difff_calibrate - give arg types
+ void do_difff_calibrate();
+../Src/main.c(176): warning: #223-D: function "printf" declared implicitly
+ printf("进入升级模式\r\n");
+../Src/main.c(179): warning: #223-D: function "delay_ms" declared implicitly
+ delay_ms(100);
+../Src/main.c(189): warning: #223-D: function "delay_ms" declared implicitly
+ delay_ms(100);
+../Src/main.c(196): warning: #223-D: function "delay_ms" declared implicitly
+ delay_ms(100);
+../Src/main.c(226): warning: #186-D: pointless comparison of unsigned integer with zero
+ if(g_com_map[POWER]<0)
+../Src/main.c(298): warning: #223-D: function "printf" declared implicitly
+ printf("固件版本:SS双路定位标签-防撞基站 V%d.%d. \r\n",g_com_map[VERSION]>>8,g_com_map[VERSION]&0xff);
+../Src/main.c(239): warning: #177-D: variable "temp" was declared but never referenced
+ { float temp;
+../Src/main.c(240): warning: #177-D: variable "temp2" was declared but never referenced
+ uint16_t temp2;
+../Src/main.c(241): warning: #177-D: variable "i" was declared but never referenced
+ uint16_t i;
+../Src/main.c(363): warning: #223-D: function "UWB_RXOFF" declared implicitly
+ UWB_RXOFF();
+../Src/main.c(367): warning: #223-D: function "UWB_RXON" declared implicitly
+ UWB_RXON();
+../Src/main.c(347): warning: #177-D: variable "temp" was declared but never referenced
+ { char temp[50];
+../Src/main.c(348): warning: #177-D: variable "len" was declared but never referenced
+ uint8_t len;
+../Src/main.c(472): warning: #177-D: variable "blink_count" was declared but never referenced
+ { static uint16_t blink_count=0;
+../Src/main.c(835): warning: #223-D: function "Usart1InitVariables" declared implicitly
+ Usart1InitVariables();
+../Src/main.c(802): warning: #177-D: variable "GPIO_InitStruct" was declared but never referenced
+ GPIO_InitTypeDef GPIO_InitStruct = {0};
+../Src/main.c(963): warning: #177-D: variable "i" was declared but never referenced
+ static uint8_t i=0;
+../Src/main.c(310): warning: #177-D: function "SystemPower_Config" was declared but never referenced
+ static void SystemPower_Config(void)
+../Src/main.c: 22 warnings, 0 errors
+linking...
+Program Size: Code=27932 RO-data=988 RW-data=584 ZI-data=7496
+FromELF: creating hex file...
+"L051\L051.axf" - 0 Error(s), 22 Warning(s).
+=======
compiling deca_device.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
@@ -53,6 +110,7 @@
Program Size: Code=27932 RO-data=988 RW-data=580 ZI-data=7196
FromELF: creating hex file...
"L051\L051.axf" - 0 Error(s), 10 Warning(s).
+>>>>>>> 266dcffc919008dedf2acc84f7f52a3aff83bf07
<h2>Software Packages used:</h2>
--
Gitblit v1.9.3