schöner aber auch nicht funktioneller

[svn42.git] / firmware / tuer.pde

diff --git a/firmware/tuer.pde b/firmware/tuer.pde
index 10efc92..20639fe 100644 (file)
--- a/firmware/tuer.pde
+++ b/firmware/tuer.pde
@@ -22,7 +22,6 @@ byte next_led = 0;
 
 #define AJAR_PIN 14 // input pin for reed relais (door ajar/shut)
 boolean ajar_last_state = false;
-boolean ajar_state_changed = false;
 
 #define MANUAL_OPEN_PIN 12  // keys for manual open and close
 #define MANUAL_CLOSE_PIN 13 // 
@@ -81,19 +80,16 @@ boolean is_closed()
 
 //**********//
 
-void init_ajar()
+boolean get_ajar_status()  // shut = true, ajar = false
 {
-  pinMode(AJAR_PIN, INPUT);      // set pin to input
-  digitalWrite(AJAR_PIN, HIGH);  // turn on pullup resistors  
-  ajar_last_state = digitalRead(AJAR_PIN);
+  return (digitalRead(AJAR_PIN) == LOW);
 }
 
-boolean get_ajar_status()  // shut = true, ajar = false
+void init_ajar()
 {
-  if(digitalRead(AJAR_PIN))
-     return false;
-     
-  return true;
+  pinMode(AJAR_PIN, INPUT);      // set pin to input
+  digitalWrite(AJAR_PIN, HIGH);  // turn on pullup resistors  
+  ajar_last_state = get_ajar_status();
 }
 
 //**********//
@@ -461,19 +457,12 @@ void init_heartbeat()
 // while running this gets called every ~10ms
 ISR(TIMER2_COMPA_vect)
 {
-  boolean a = get_ajar_status();
   heartbeat_cnt++;
-  if(heartbeat_cnt == HEARTBEAT_DURATION) {
+  if(heartbeat_cnt == HEARTBEAT_DURATION)
     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;
-    if(a != ajar_last_state)
-      ajar_state_changed = true;
-    ajar_last_state = a;
   }
 }
 
@@ -631,8 +620,10 @@ void loop()
       PORTD = LEDS_ON;
     }
   }
-  if(ajar_state_changed) {
-    ajar_state_changed = false;
+  boolean a = get_ajar_status();
+  if (a != ajar_last_state)
+  {
     print_status();
+    ajar_last_state = a;
   }
 }