From d66187e82c8715a36aa5c790ed0e01bb0e656081 Mon Sep 17 00:00:00 2001
From: yincheng.zhong <634916154@qq.com>
Date: 星期三, 11 十月 2023 11:40:19 +0800
Subject: [PATCH] V2.56 修改震动逻辑
---
Src/main.c | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/Src/main.c b/Src/main.c
index f3c5f37..d961702 100644
--- a/Src/main.c
+++ b/Src/main.c
@@ -133,12 +133,12 @@
if(g_com_map[MOTOR_ENABLE])
{
- if(motor_keeptime>0)
- {
- motor_state = 2;
- }else{
- motor_state = 0;
- }
+// if(motor_keeptime>0)
+// {
+// motor_state = 2;
+// }else{
+// motor_state = 0;
+// }
//motor_state=2;
switch(motor_state)
{case 0:
@@ -288,7 +288,7 @@
hardware_pici= STMFLASH_ReadHalfWord(FLASH_HARDWARE_VERSION_MAP+2);
hardware_type= STMFLASH_ReadHalfWord(FLASH_HARDWARE_VERSION_MAP+4);
//deca_sleep(1000);
- g_com_map[VERSION] = (2<<8)|67;
+ g_com_map[VERSION] = (2<<8)|56;
// g_com_map[DEV_ID]=0x7;
#ifdef DEBUG_MODE
@@ -337,6 +337,7 @@
{
Error_Handler();
}
+ printf("固件版本:SS双路定位标签-防撞标签 V%d.%d. \r\n",g_com_map[VERSION]>>8,g_com_map[VERSION]&0xff);
//g_com_map[NOMOVESLEEP_TIME]=5;
// printf("标签ID: %d .\r\n",dev_id);
// printf("通讯间隔: %d ms.\r\n",g_com_map[COM_INTERVAL]);
@@ -366,9 +367,9 @@
GPIO_InitTypeDef GPIO_InitStruct = {0};
if(g_com_map[MOTORBEEPER_INDEX]!=1&&g_com_map[MOTORBEEPER_INDEX]!=2)
{
- g_com_map[MOTORBEEPER_INDEX] = 2;
+ g_com_map[MOTORBEEPER_INDEX] = 1;
}
- hardware_type = g_com_map[MOTORBEEPER_INDEX];
+ hardware_type = NSH1;//g_com_map[MOTORBEEPER_INDEX];
switch(hardware_type)
{
case 1:
--
Gitblit v1.9.3