From 935b9e641eb1cb6b1e9504e532ef34cc6f24ab1a Mon Sep 17 00:00:00 2001
From: yincheng.zhong <634916154@qq.com>
Date: 星期四, 26 十月 2023 15:06:34 +0800
Subject: [PATCH] Merge branch 'SS定位-临近-防撞标签' of http://47.108.70.204:60062/r/XRange_Tag into SS定位-临近-防撞标签
---
MDK-ARM/L051/L051.build_log.htm | 46 ++++++++++++++++++++++++----------------------
1 files changed, 24 insertions(+), 22 deletions(-)
diff --git a/MDK-ARM/L051/L051.build_log.htm b/MDK-ARM/L051/L051.build_log.htm
index 30b93bb..23672c4 100644
--- a/MDK-ARM/L051/L051.build_log.htm
+++ b/MDK-ARM/L051/L051.build_log.htm
@@ -3,26 +3,26 @@
<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: 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: CMSIS_AGDI.dll V1.32.5.0
+Dialog DLL: TARMCM1.DLL V1.14.2.0
<h2>Project:</h2>
-E:\GIT\XRange_Tag\MDK-ARM\L051.uvprojx
-Project File Date: 06/22/2023
+E:\GIT\XRange_Tag - 副本\MDK-ARM\L051.uvprojx
+Project File Date: 10/10/2023
<h2>Output:</h2>
*** Using Compiler 'V5.06 update 6 (build 750)', folder: 'D:\Keil_v5\ARM\ARMCC\Bin'
@@ -46,37 +46,39 @@
delay_ms(100);
../Src/main.c(270): warning: #186-D: pointless comparison of unsigned integer with zero
if(g_com_map[POWER]<0)
+../Src/main.c(340): 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(282): warning: #177-D: variable "temp" was declared but never referenced
{ float temp;
../Src/main.c(283): warning: #177-D: variable "temp2" was declared but never referenced
uint16_t temp2;
../Src/main.c(284): warning: #177-D: variable "i" was declared but never referenced
uint16_t i;
-../Src/main.c(389): warning: #177-D: variable "temp" was declared but never referenced
+../Src/main.c(390): warning: #177-D: variable "temp" was declared but never referenced
{ char temp[50];
-../Src/main.c(390): warning: #177-D: variable "len" was declared but never referenced
+../Src/main.c(391): warning: #177-D: variable "len" was declared but never referenced
uint8_t len;
-../Src/main.c(450): warning: #223-D: function "BarInit" declared implicitly
+../Src/main.c(451): warning: #223-D: function "BarInit" declared implicitly
BarInit();
-../Src/main.c(490): warning: #177-D: variable "blink_count" was declared but never referenced
+../Src/main.c(491): warning: #177-D: variable "blink_count" was declared but never referenced
{ static uint16_t blink_count=0;
-../Src/main.c(817): warning: #223-D: function "Usart1InitVariables" declared implicitly
+../Src/main.c(818): warning: #223-D: function "Usart1InitVariables" declared implicitly
Usart1InitVariables();
-../Src/main.c(784): warning: #177-D: variable "GPIO_InitStruct" was declared but never referenced
+../Src/main.c(785): warning: #177-D: variable "GPIO_InitStruct" was declared but never referenced
GPIO_InitTypeDef GPIO_InitStruct = {0};
-../Src/main.c(999): warning: #223-D: function "delay_ms" declared implicitly
+../Src/main.c(1000): warning: #223-D: function "delay_ms" declared implicitly
delay_ms(100);
-../Src/main.c(1002): warning: #223-D: function "delay_ms" declared implicitly
+../Src/main.c(1003): warning: #223-D: function "delay_ms" declared implicitly
delay_ms(10);
-../Src/main.c(963): warning: #177-D: variable "i" was declared but never referenced
+../Src/main.c(964): warning: #177-D: variable "i" was declared but never referenced
static uint8_t i=0;
-../Src/main.c(351): warning: #177-D: function "SystemPower_Config" was declared but never referenced
+../Src/main.c(352): warning: #177-D: function "SystemPower_Config" was declared but never referenced
static void SystemPower_Config(void)
-../Src/main.c: 22 warnings, 0 errors
+../Src/main.c: 23 warnings, 0 errors
linking...
-Program Size: Code=32508 RO-data=540 RW-data=508 ZI-data=7516
+Program Size: Code=33352 RO-data=544 RW-data=508 ZI-data=7516
FromELF: creating hex file...
-"L051\L051.axf" - 0 Error(s), 22 Warning(s).
+"L051\L051.axf" - 0 Error(s), 23 Warning(s).
<h2>Software Packages used:</h2>
--
Gitblit v1.9.3