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定位-临近-防撞标签
---
Src/main.c | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/Src/main.c b/Src/main.c
index 170e21f..3f83325 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)|51;
+ g_com_map[VERSION] = (2<<8)|57;
// g_com_map[DEV_ID]=0x7;
#ifdef DEBUG_MODE
@@ -369,7 +369,7 @@
{
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