From 858c42df60ffeb07dc5916e2cec1f0b98b1b4e39 Mon Sep 17 00:00:00 2001
From: yincheng.zhong <634916154@qq.com>
Date: 星期五, 12 五月 2023 12:04:39 +0800
Subject: [PATCH] V2.4 1.修改震动逻辑，先短振3下，5秒后再振3下，每5分钟循环一次，如果短按按键，2小时内不再震动。 2.SOS改成长按3秒按键触发。
---
MDK-ARM/L051/L051.build_log.htm | 36 ++++++++++++++++++------------------
1 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/MDK-ARM/L051/L051.build_log.htm b/MDK-ARM/L051/L051.build_log.htm
index ad65df6..8575478 100644
--- a/MDK-ARM/L051/L051.build_log.htm
+++ b/MDK-ARM/L051/L051.build_log.htm
@@ -17,12 +17,12 @@
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: STLink\ST-LINKIII-KEIL_SWO.dll V3.0.7.0
+Target DLL: Segger\JL2CM3.dll V2.99.36.0
Dialog DLL: TARMCM1.DLL V1.14.1.0
<h2>Project:</h2>
E:\GIT\XRange_Tag - 副本\MDK-ARM\L051.uvprojx
-Project File Date: 05/09/2023
+Project File Date: 05/11/2023
<h2>Output:</h2>
*** Using Compiler 'V5.06 update 6 (build 750)', folder: 'D:\Keil_v5\ARM\ARMCC\Bin'
@@ -36,39 +36,39 @@
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(216): warning: #223-D: function "delay_ms" declared implicitly
+../Src/main.c(269): warning: #223-D: function "delay_ms" declared implicitly
delay_ms(100);
-../Src/main.c(246): warning: #186-D: pointless comparison of unsigned integer with zero
+../Src/main.c(299): warning: #186-D: pointless comparison of unsigned integer with zero
if(g_com_map[POWER]<0)
-../Src/main.c(310): warning: #223-D: function "printf" declared implicitly
+../Src/main.c(363): 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(251): warning: #177-D: variable "temp" was declared but never referenced
+../Src/main.c(304): warning: #177-D: variable "temp" was declared but never referenced
{ float temp;
-../Src/main.c(252): warning: #177-D: variable "temp2" was declared but never referenced
+../Src/main.c(305): warning: #177-D: variable "temp2" was declared but never referenced
uint16_t temp2;
-../Src/main.c(253): warning: #177-D: variable "i" was declared but never referenced
+../Src/main.c(306): warning: #177-D: variable "i" was declared but never referenced
uint16_t i;
-../Src/main.c(396): warning: #223-D: function "BarInit" declared implicitly
+../Src/main.c(449): warning: #223-D: function "BarInit" declared implicitly
BarInit();
-../Src/main.c(436): warning: #177-D: variable "blink_count" was declared but never referenced
+../Src/main.c(485): warning: #177-D: variable "blink_count" was declared but never referenced
{ static uint16_t blink_count=0;
-../Src/main.c(438): warning: #177-D: variable "uwbcount" was declared but never referenced
+../Src/main.c(487): warning: #177-D: variable "uwbcount" was declared but never referenced
static u8 uwbcount =0;
-../Src/main.c(765): warning: #223-D: function "Usart1InitVariables" declared implicitly
+../Src/main.c(814): warning: #223-D: function "Usart1InitVariables" declared implicitly
Usart1InitVariables();
-../Src/main.c(732): warning: #177-D: variable "GPIO_InitStruct" was declared but never referenced
+../Src/main.c(781): warning: #177-D: variable "GPIO_InitStruct" was declared but never referenced
GPIO_InitTypeDef GPIO_InitStruct = {0};
-../Src/main.c(969): warning: #223-D: function "delay_ms" declared implicitly
+../Src/main.c(1023): warning: #223-D: function "delay_ms" declared implicitly
delay_ms(100);
-../Src/main.c(972): warning: #223-D: function "delay_ms" declared implicitly
+../Src/main.c(1026): warning: #223-D: function "delay_ms" declared implicitly
delay_ms(10);
-../Src/main.c(920): warning: #177-D: variable "i" was declared but never referenced
+../Src/main.c(970): warning: #177-D: variable "i" was declared but never referenced
static uint8_t i=0;
-../Src/main.c(316): warning: #177-D: function "SystemPower_Config" was declared but never referenced
+../Src/main.c(369): warning: #177-D: function "SystemPower_Config" was declared but never referenced
static void SystemPower_Config(void)
../Src/main.c: 19 warnings, 0 errors
linking...
-Program Size: Code=31296 RO-data=1056 RW-data=468 ZI-data=7308
+Program Size: Code=31240 RO-data=1056 RW-data=476 ZI-data=7308
FromELF: creating hex file...
"L051\L051.axf" - 0 Error(s), 19 Warning(s).
--
Gitblit v1.9.3