From ae0ac687e1b68ed3c067deb67dffaea9582f329c Mon Sep 17 00:00:00 2001
From: yincheng.zhong <634916154@qq.com>
Date: 星期四, 23 十一月 2023 16:55:35 +0800
Subject: [PATCH] V1.2 修改继电器报警错误
---
源码/核心板/Src/application/dw_app.c | 41 ++++++++++++++++++++++++++++-------------
1 files changed, 28 insertions(+), 13 deletions(-)
diff --git "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/application/dw_app.c" "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/application/dw_app.c"
index 07e95fe..ced8d21 100644
--- "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/application/dw_app.c"
+++ "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/application/dw_app.c"
@@ -884,19 +884,34 @@
}else{
memcpy(&tx_nearresp_msg[DIST_IDX], &tagdist_list[taglist_pos], 4);
}
-
- if(tagdist_list[taglist_pos]<g_com_map[ALARM_DISTANCE1])
- {
- motorstate =0;
- }else if(tagdist_list[taglist_pos]<g_com_map[ALARM_DISTANCE2])
- {
- motorstate =2;
- }else if(tagdist_list[taglist_pos]<g_com_map[ALARM_DISTANCE3])
- {
- motorstate =1;
- }else{
- motorstate =0;
- }
+ if(tag_id_recv>>12!=9)
+ {
+ if(tagdist_list[taglist_pos]<g_com_map[ALARM_DISTANCE1])
+ {
+ motorstate =0;
+ }else if(tagdist_list[taglist_pos]<g_com_map[ALARM_DISTANCE2])
+ {
+ motorstate =2;
+ }else if(tagdist_list[taglist_pos]<g_com_map[ALARM_DISTANCE3])
+ {
+ motorstate =1;
+ }else{
+ motorstate =0;
+ }
+ }else{
+ if(tagdist_list[taglist_pos]<g_com_map[RELAY2_DISTANCE1])
+ {
+ motorstate =0;
+ }else if(tagdist_list[taglist_pos]<g_com_map[RELAY2_DISTANCE2])
+ {
+ motorstate =2;
+ }else if(tagdist_list[taglist_pos]<g_com_map[RELAY2_DISTANCE3])
+ {
+ motorstate =1;
+ }else{
+ motorstate =0;
+ }
+ }
tx_nearresp_msg[GROUP_ID_IDX] = group_id;
tx_nearresp_msg[MAINBASE_INDEX]=flag_syncbase;
--
Gitblit v1.9.3