From 31ee4794fbefac2963dee237aca3519c19218d46 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期六, 14 八月 2021 19:56:55 +0800
Subject: [PATCH] 增加继电器分别控制，增加继电器持续时间控制
---
源码/核心板/Src/main.c | 25 ++++++++++++++++++-------
1 files changed, 18 insertions(+), 7 deletions(-)
diff --git "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/main.c" "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/main.c"
index de17fd0..c4f90b7 100644
--- "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/main.c"
+++ "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/main.c"
@@ -72,11 +72,25 @@
checksum = Checksum_u16(&hbsend[2],12);
memcpy(&hbsend[14],&checksum,2);
}
+
uint16_t vel_factor,pos_factor;
u16 tyncpoll_time,dist_threshold,group_id;
u16 slottime,max_slotpos;
extern u8 module_power;
extern u16 total_slotnum;
+void ComMapCheck(void)
+{
+
+ if(g_com_map[WAR_JDQ_TIME]>1000||g_com_map[WAR_JDQ_TIME]<0)
+ {
+ g_com_map[WAR_JDQ_TIME] = 1;
+ }
+ if(dist_threshold<300)
+ {dist_threshold = 300;}
+ if(dist_threshold>15000)
+ {dist_threshold = 15000;}
+}
+u16 JDQ_time;
void Program_Init(void)
{ float temp;
u16 temp2;
@@ -100,13 +114,10 @@
{
g_com_map[COM_INTERVAL]=100;
}
-
- g_com_map[VERSION] = 0x0132;
-dist_threshold = (g_com_map[SPEEDFILTER_THRES]*10)/(1000/g_com_map[COM_INTERVAL]);
- if(dist_threshold<300)
- {dist_threshold = 300;}
- if(dist_threshold>15000)
- {dist_threshold = 15000;}
+ JDQ_time = g_com_map[WAR_JDQ_TIME];
+ g_com_map[VERSION] = 0x0133;
+ dist_threshold = (g_com_map[SPEEDFILTER_THRES]*10)/(1000/g_com_map[COM_INTERVAL]);
+ ComMapCheck();
g_com_map[SW_TYPE] = SW_FANGZHUANG;
dev_id = g_com_map[DEV_ID];
group_id=g_com_map[GROUP_ID];
--
Gitblit v1.9.3