X-Git-Url: https://git.realraum.at/?a=blobdiff_plain;f=firmware%2Ftuer.pde;h=3813e0022cae357795f76df688659e47c4095a90;hb=d5e72b4ce575bcec2699edad4c9420cbc05855a3;hp=5cde5471ba8b355c7705239269411ded6bee4f66;hpb=0ee06169ba0b63def2038e16b605d1e2dce6250a;p=svn42.git

diff --git a/firmware/tuer.pde b/firmware/tuer.pde
index 5cde547..3813e00 100644
--- a/firmware/tuer.pde
+++ b/firmware/tuer.pde
@@ -21,8 +21,9 @@ byte next_led = 0;
 #define LIMIT_CLOSED_PIN 19 // A5: limit switch for close
 
 #define AJAR_PIN 14 // input pin for reed relais (door ajar/shut)
-boolean ajar_last_state = false;
-boolean ajar_state_changed = false;
+#define SHUT 0
+#define AJAR 1
+byte ajar_last_state = SHUT;
 
 #define MANUAL_OPEN_PIN 12  // keys for manual open and close
 #define MANUAL_CLOSE_PIN 13 // 
@@ -81,19 +82,19 @@ boolean is_closed()
 
 //**********//
 
-void init_ajar()
+byte get_ajar_status()
 {
-  pinMode(AJAR_PIN, INPUT);      // set pin to input
-  digitalWrite(AJAR_PIN, HIGH);  // turn on pullup resistors  
-  ajar_last_state = digitalRead(AJAR_PIN);
+  if(digitalRead(AJAR_PIN) == LOW)
+    return SHUT;
+  
+  return AJAR;
 }
 
-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();
 }
 
 //**********//
@@ -391,7 +392,7 @@ ISR(TIMER1_COMPA_vect)
     else if(is_closed())
       Serial.print("closed");
     Serial.print(", idle");
-    if(get_ajar_status())
+    if(get_ajar_status() == SHUT)
       Serial.println(", shut");
     else
       Serial.println(", ajar");
@@ -461,10 +462,6 @@ void init_heartbeat()
 // while running this gets called every ~10ms
 ISR(TIMER2_COMPA_vect)
 {
-  boolean a = get_ajar_status();
-  if(a != ajar_last_state) 
-    ajar_state_changed = true;
-  ajar_last_state = a;
   heartbeat_cnt++;
   if(heartbeat_cnt == HEARTBEAT_DURATION)
     heartbeat_off();
@@ -528,7 +525,7 @@ void print_status()
   case WAIT: Serial.print(", waiting"); break;
   default: Serial.print(", <undefined state>"); break;
   }
-  if(get_ajar_status())
+  if(get_ajar_status() == SHUT)
     Serial.println(", shut");
   else
     Serial.println(", ajar");
@@ -628,8 +625,10 @@ void loop()
       PORTD = LEDS_ON;
     }
   }
-  if(ajar_state_changed) {
-    ajar_state_changed = false;
+  byte a = get_ajar_status();
+  if(a != ajar_last_state)
+  {
     print_status();
+    ajar_last_state = a;
   }
 }