Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
U
uniset2
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
UniSet project repositories
uniset2
Commits
259b2619
Commit
259b2619
authored
May 19, 2015
by
Pavel Vainerman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
(DelayTimer): исправлена ошибка в логике работы!
parent
9e672ef7
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
19 additions
and
8 deletions
+19
-8
DelayTimer.h
include/DelayTimer.h
+10
-8
test_delaytimer.cc
tests/test_delaytimer.cc
+9
-0
No files found.
include/DelayTimer.h
View file @
259b2619
...
@@ -60,6 +60,8 @@ class DelayTimer
...
@@ -60,6 +60,8 @@ class DelayTimer
inline
bool
check
(
bool
st
)
inline
bool
check
(
bool
st
)
{
{
prevState
=
st
;
if
(
waiting_off
)
if
(
waiting_off
)
{
{
if
(
pt
.
checkTime
()
)
if
(
pt
.
checkTime
()
)
...
@@ -71,10 +73,9 @@ class DelayTimer
...
@@ -71,10 +73,9 @@ class DelayTimer
return
state
;
return
state
;
}
}
else
if
(
st
!=
prevState
&&
!
st
)
else
if
(
st
)
pt
.
reset
()
;
waiting_off
=
false
;
prevState
=
st
;
return
state
;
return
state
;
}
}
...
@@ -89,17 +90,14 @@ class DelayTimer
...
@@ -89,17 +90,14 @@ class DelayTimer
return
state
;
return
state
;
}
}
else
if
(
st
!=
prevState
&&
st
)
else
if
(
!
st
)
pt
.
reset
()
;
waiting_on
=
false
;
prevState
=
st
;
return
state
;
return
state
;
}
}
if
(
state
!=
st
)
if
(
state
!=
st
)
{
{
prevState
=
st
;
if
(
st
)
if
(
st
)
{
{
pt
.
setTiming
(
onDelay
);
pt
.
setTiming
(
onDelay
);
...
@@ -111,8 +109,12 @@ class DelayTimer
...
@@ -111,8 +109,12 @@ class DelayTimer
waiting_off
=
true
;
waiting_off
=
true
;
}
}
// на случае если таймеры = 0..
if
(
pt
.
checkTime
()
)
if
(
pt
.
checkTime
()
)
{
state
=
st
;
return
st
;
return
st
;
}
}
}
return
state
;
return
state
;
...
...
tests/test_delaytimer.cc
View file @
259b2619
...
@@ -128,5 +128,14 @@ TEST_CASE("[DelayTimer]: debounce", "[DelayTimer]" )
...
@@ -128,5 +128,14 @@ TEST_CASE("[DelayTimer]: debounce", "[DelayTimer]" )
msleep
(
40
);
msleep
(
40
);
CHECK_FALSE
(
dt
.
check
(
false
)
);
CHECK_FALSE
(
dt
.
check
(
false
)
);
CHECK_FALSE
(
dt
.
get
()
);
CHECK_FALSE
(
dt
.
get
()
);
// проверяем срабатвание (одноразовый скачок)
CHECK_FALSE
(
dt
.
check
(
true
)
);
CHECK_FALSE
(
dt
.
check
(
false
)
);
msleep
(
160
);
CHECK_FALSE
(
dt
.
check
(
true
)
);
CHECK_FALSE
(
dt
.
check
(
false
)
);
msleep
(
160
);
CHECK_FALSE
(
dt
.
check
(
false
)
);
}
}
// -----------------------------------------------------------------------------
// -----------------------------------------------------------------------------
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment