From 5739481744a7d26671190f6f327726e23843dd6d Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期一, 02 十一月 2020 15:34:13 +0800
Subject: [PATCH] Merge branch '定位-临近' into 定位临近_工卡
---
MDK-ARM/L051/L051.build_log.htm | 52 ++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 38 insertions(+), 14 deletions(-)
diff --git a/MDK-ARM/L051/L051.build_log.htm b/MDK-ARM/L051/L051.build_log.htm
index 626a431..c2e8e47 100644
--- a/MDK-ARM/L051/L051.build_log.htm
+++ b/MDK-ARM/L051/L051.build_log.htm
@@ -22,27 +22,51 @@
<h2>Project:</h2>
E:\GIT\XRange_Tag\MDK-ARM\L051.uvprojx
-Project File Date: 10/21/2020
+Project File Date: 10/27/2020
<h2>Output:</h2>
*** Using Compiler 'V5.06 update 6 (build 750)', folder: 'D:\Keil_v5\ARM\ARMCC\Bin'
Build target 'L051'
-compiling dps368_test.c...
-..\Src\ExternalDevices\lis3dh_driver.h(67): warning: #1295-D: Deprecated declaration LIS3DH_ENTER_STY_Init - give arg types
+compiling main.c...
+..\Src\application\global_param.h(47): warning: #47-D: incompatible redefinition of macro "MOTOR_ONTIME" (declared at line 34 of "..\Src\ExternalDevices\led.h")
+ #define MOTOR_ONTIME 0x21
+..\Drivers\ExternlDrivers\lis3dh_driver.h(67): warning: #1295-D: Deprecated declaration LIS3DH_ENTER_STY_Init - give arg types
void LIS3DH_ENTER_STY_Init();
-..\Src\ExternalDevices\dps368_test.c(45): warning: #177-D: variable "temp" was declared but never referenced
- uint32_t temp=0;
-..\Src\ExternalDevices\dps368_test.c(67): warning: #940-D: missing return statement at end of non-void function "test_write_byte"
- }
-..\Src\ExternalDevices\dps368_test.c(146): warning: #1-D: last line of file ends without a newline
- }
-..\Src\ExternalDevices\dps368_test.c(141): warning: #550-D: variable "ret" was set but never used
- { u8 ret;
-..\Src\ExternalDevices\dps368_test.c: 5 warnings, 0 errors
+../Src/main.c(178): warning: #223-D: function "FLASH_Prepare" declared implicitly
+ result = FLASH_Prepare(0x8004A38, 128);
+../Src/main.c(180): warning: #223-D: function "FLASH_Write" declared implicitly
+ result = FLASH_Write(0x8004A38, (const uint8_t*)&tmp, 2);
+../Src/main.c(182): warning: #223-D: function "printf" declared implicitly
+ printf("进入升级模式\r\n");
+../Src/main.c(185): warning: #223-D: function "delay_ms" declared implicitly
+ delay_ms(100);
+../Src/main.c(195): warning: #223-D: function "delay_ms" declared implicitly
+ delay_ms(100);
+../Src/main.c(202): warning: #223-D: function "delay_ms" declared implicitly
+ delay_ms(100);
+../Src/main.c(273): warning: #186-D: pointless comparison of unsigned integer with zero
+ if(module_power<0)
+../Src/main.c(296): warning: #223-D: function "printf" declared implicitly
+ printf("标签ID: %d .\r\n",dev_id);
+../Src/main.c(249): warning: #177-D: variable "temp" was declared but never referenced
+ { float temp;
+../Src/main.c(250): warning: #177-D: variable "temp2" was declared but never referenced
+ uint16_t temp2;
+../Src/main.c(251): warning: #177-D: variable "i" was declared but never referenced
+ uint16_t i;
+../Src/main.c(399): warning: #177-D: variable "blink_count" was declared but never referenced
+ { static uint16_t blink_count=0;
+../Src/main.c(670): warning: #223-D: function "Usart1InitVariables" declared implicitly
+ Usart1InitVariables();
+../Src/main.c(637): warning: #177-D: variable "GPIO_InitStruct" was declared but never referenced
+ GPIO_InitTypeDef GPIO_InitStruct = {0};
+../Src/main.c(306): warning: #177-D: function "SystemPower_Config" was declared but never referenced
+ static void SystemPower_Config(void)
+../Src/main.c: 17 warnings, 0 errors
linking...
-Program Size: Code=32312 RO-data=396 RW-data=416 ZI-data=6832
+Program Size: Code=22628 RO-data=396 RW-data=268 ZI-data=6468
FromELF: creating hex file...
-"L051\L051.axf" - 0 Error(s), 5 Warning(s).
+"L051\L051.axf" - 0 Error(s), 17 Warning(s).
<h2>Software Packages used:</h2>
--
Gitblit v1.9.3