From b5413f1f00fcf13104b07807e2046372764ef8dc Mon Sep 17 00:00:00 2001
From: miyanhui <dennismi1024@gmail.com>
Date: 星期一, 18 二月 2019 10:12:41 +0800
Subject: [PATCH] 合并代码解决冲突
---
QiaoJiaSystem/RapidStructureApp/TriggerElement.cpp | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/QiaoJiaSystem/RapidStructureApp/TriggerElement.cpp b/QiaoJiaSystem/RapidStructureApp/TriggerElement.cpp
index 6f0272d..11233ce 100644
--- a/QiaoJiaSystem/RapidStructureApp/TriggerElement.cpp
+++ b/QiaoJiaSystem/RapidStructureApp/TriggerElement.cpp
@@ -78,7 +78,13 @@
lastDown = 0;
triggerType = DOWN;
}
+void TriggerElement::resetTriggerState()
+{
+ //state=false;
+ triggerState=false;
+ triggerTimes=0;
+}
void TriggerElement::timerFunc() {
--
Gitblit v1.8.0