From 25eae971d34c0d0f7a5fc9dd70e98711fc950006 Mon Sep 17 00:00:00 2001
From: test <pansen626@sina.com>
Date: 星期一, 22 四月 2019 09:49:55 +0800
Subject: [PATCH] 修改人员异常的大于小于设置，并使用-1作为不生效以应对单边限制
---
QiaoJiaSystem/RapidStructureApp/TriggerElement.cpp | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/QiaoJiaSystem/RapidStructureApp/TriggerElement.cpp b/QiaoJiaSystem/RapidStructureApp/TriggerElement.cpp
index 6f0272d..541c29f 100644
--- a/QiaoJiaSystem/RapidStructureApp/TriggerElement.cpp
+++ b/QiaoJiaSystem/RapidStructureApp/TriggerElement.cpp
@@ -5,7 +5,7 @@
// TimerElement(1),
triggerState(false),
tolerance(tolerance), delay(delay),
- triggerType(DOWN), triggerTimes(0),lastDown(0),lastUp(0) {
+ triggerType(DOWN), triggerTimes(0), lastDown(0), lastUp(0) {
}
@@ -79,6 +79,12 @@
triggerType = DOWN;
}
+void TriggerElement::resetTriggerState() {
+
+ //state=false;
+ triggerState = false;
+ triggerTimes = 0;
+}
void TriggerElement::timerFunc() {
--
Gitblit v1.8.0