From 051c6863dd418c9cfbca787e449fbdeadde977c7 Mon Sep 17 00:00:00 2001
From: pans <pansen626@sina.com>
Date: 星期二, 16 四月 2019 17:17:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.3nsq' into 1.3nsq
---
QiaoJiaSystem/RapidStructureApp/TriggerElement.cpp | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/QiaoJiaSystem/RapidStructureApp/TriggerElement.cpp b/QiaoJiaSystem/RapidStructureApp/TriggerElement.cpp
index b2b89af..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) {
}
@@ -70,7 +70,7 @@
}
bool TriggerElement::getTriggerState() const {
- return state;
+ return triggerState;
}
void TriggerElement::threadInitial() {
@@ -79,6 +79,12 @@
triggerType = DOWN;
}
+void TriggerElement::resetTriggerState() {
+
+ //state=false;
+ triggerState = false;
+ triggerTimes = 0;
+}
void TriggerElement::timerFunc() {
--
Gitblit v1.8.0