From 0a762a217fe499b7b63d55ed4b46dde1afd49f28 Mon Sep 17 00:00:00 2001
From: pans <pansen626@sina.com>
Date: 星期一, 15 四月 2019 16:57:06 +0800
Subject: [PATCH] .3nsq: Auto stash before merge of "1.3nsq" and "origin/1.3nsq"
---
QiaoJiaSystem/RapidStructureApp/TriggerElement.cpp | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/QiaoJiaSystem/RapidStructureApp/TriggerElement.cpp b/QiaoJiaSystem/RapidStructureApp/TriggerElement.cpp
index 11233ce..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) {
}
@@ -78,12 +78,12 @@
lastDown = 0;
triggerType = DOWN;
}
-void TriggerElement::resetTriggerState()
-{
+
+void TriggerElement::resetTriggerState() {
//state=false;
- triggerState=false;
- triggerTimes=0;
+ triggerState = false;
+ triggerTimes = 0;
}
void TriggerElement::timerFunc() {
--
Gitblit v1.8.0