projects
/
svn42.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
23bca29
)
fixed ajar state change check
author
Christian Pointner
<equinox@realraum.at>
Wed, 23 Nov 2011 00:30:16 +0000
(
00:30
+0000)
committer
Christian Pointner
<equinox@realraum.at>
Wed, 23 Nov 2011 00:30:16 +0000
(
00:30
+0000)
firmware/tuer.pde
patch
|
blob
|
history
diff --git
a/firmware/tuer.pde
b/firmware/tuer.pde
index
10efc92
..
5cde547
100644
(file)
--- a/
firmware/tuer.pde
+++ b/
firmware/tuer.pde
@@
-462,18
+462,15
@@
void init_heartbeat()
ISR(TIMER2_COMPA_vect)
{
boolean a = get_ajar_status();
ISR(TIMER2_COMPA_vect)
{
boolean a = get_ajar_status();
+ if(a != ajar_last_state)
+ ajar_state_changed = true;
+ ajar_last_state = a;
heartbeat_cnt++;
heartbeat_cnt++;
- if(heartbeat_cnt == HEARTBEAT_DURATION) {
+ if(heartbeat_cnt == HEARTBEAT_DURATION)
heartbeat_off();
heartbeat_off();
- if(a != ajar_last_state)
- ajar_state_changed = true;
- ajar_last_state = a;
- } else if(heartbeat_cnt >= HEARTBEAT_DELAY) {
+ else if(heartbeat_cnt >= HEARTBEAT_DELAY) {
heartbeat_on();
heartbeat_cnt = 0;
heartbeat_on();
heartbeat_cnt = 0;
- if(a != ajar_last_state)
- ajar_state_changed = true;
- ajar_last_state = a;
}
}
}
}