From 2cf69b4bbe56fc379c7f433037e043d0dba42493 Mon Sep 17 00:00:00 2001 From: miyanhui <dennismi1024@gmail.com> Date: 星期五, 15 二月 2019 15:58:59 +0800 Subject: [PATCH] Merge branch 'ywv1.2' of http://192.168.1.226:10010/r/development/c++ into ywv1.2 --- 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