From 1a87be3310e96d3cf99dc37ea6fa51b684ebb843 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期三, 28 十月 2020 20:28:17 +0800
Subject: [PATCH] V2.3 增加hardfaut重启
---
Src/main.c | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/Src/main.c b/Src/main.c
index 389f70f..486d88b 100644
--- a/Src/main.c
+++ b/Src/main.c
@@ -241,15 +241,17 @@
Usart1ParseDataCallback = UsartParseDataHandler;
parameter_init();
//deca_sleep(1000);
- g_com_map[VERSION] = 0x0110;
+ g_com_map[VERSION] = 0x0203;
#ifdef DEBUG_MODE
// g_com_map[DEV_ROLE]=1;
-// g_com_map[DEV_ID]=1;
+ g_com_map[DEV_ID]=0x123;
g_com_map[COM_INTERVAL]=100;
// g_com_map[MAX_REPORT_ANC_NUM]=1;
- g_com_map[NOMOVESLEEP_TIME]=10;
+// g_com_map[NOMOVESLEEP_TIME]=10;
+// g_com_map[IMU_ENABLE]=0;
#endif
-
+//g_com_map[NOMOVESLEEP_TIME]=10;
+// g_com_map[COM_INTERVAL]=100;
if(g_com_map[COM_INTERVAL]==0)
{
g_com_map[COM_INTERVAL]=100;
@@ -264,7 +266,8 @@
group_id=g_com_map[GROUP_ID];
dev_id = g_com_map[DEV_ID];
- slottime=ceil((double)g_com_map[MAX_REPORT_ANC_NUM]*SLOT_SCALE)+3;
+ //slottime=ceil((double)g_com_map[MAX_REPORT_ANC_NUM]*SLOT_SCALE)+3;
+ slottime = 5;
max_slotpos=g_com_map[COM_INTERVAL]/slottime;
tyncpoll_time=(g_com_map[DEV_ID]%max_slotpos)*slottime;
slot_startcount=tyncpoll_time*1000/LPTIMER_LSB;
@@ -376,6 +379,10 @@
/* USER CODE END WHILE */
/* USER CODE BEGIN 3 */
+// while(1)
+// {
+// MODBUS_Poll();
+// }
if(g_start_send_flag)
{ static uint16_t blink_count=0;
SystemClock_Config();
--
Gitblit v1.9.3