From e15c4888f720b8781260b901ac82d058f8f7c3b5 Mon Sep 17 00:00:00 2001
From: chenshijun <csj_sky@126.com>
Date: 星期三, 27 三月 2019 14:34:37 +0800
Subject: [PATCH] 移植nsq到项目中,将最短最长时长的参数修改成nsq配置

---
 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 b2b89af..11233ce 100644
--- a/QiaoJiaSystem/RapidStructureApp/TriggerElement.cpp
+++ b/QiaoJiaSystem/RapidStructureApp/TriggerElement.cpp
@@ -70,7 +70,7 @@
 }
 
 bool TriggerElement::getTriggerState() const {
-    return state;
+    return triggerState;
 }
 
 void TriggerElement::threadInitial() {
@@ -78,7 +78,13 @@
     lastDown = 0;
     triggerType = DOWN;
 }
+void TriggerElement::resetTriggerState()
+{
 
+    //state=false;
+    triggerState=false;
+    triggerTimes=0;
+}
 
 void TriggerElement::timerFunc() {
 

--
Gitblit v1.8.0