X-Git-Url: https://git.realraum.at/?p=svn42.git;a=blobdiff_plain;f=firmware%2Ftuer.pde;h=10efc920a6790a86aa16c6c904c62cd671601bc0;hp=0f2246c157dc6265758059a8fadf30a2ebc545b0;hb=23bca293edd1f88e9bed2930e216ee4d0c38bcb0;hpb=d65af9917cd4e4f7ad0ebae54d7666f75fb5f1a5

diff --git a/firmware/tuer.pde b/firmware/tuer.pde
index 0f2246c..10efc92 100644
--- a/firmware/tuer.pde
+++ b/firmware/tuer.pde
@@ -20,6 +20,10 @@ byte next_led = 0;
 #define LIMIT_OPENED_PIN 18 // A4: limit switch for open
 #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 MANUAL_OPEN_PIN 12  // keys for manual open and close
 #define MANUAL_CLOSE_PIN 13 // 
 #define DEBOUNCE_DELAY 6250  // * 16us = 100ms
@@ -77,6 +81,23 @@ boolean is_closed()
 
 //**********//
 
+void init_ajar()
+{
+  pinMode(AJAR_PIN, INPUT);      // set pin to input
+  digitalWrite(AJAR_PIN, HIGH);  // turn on pullup resistors  
+  ajar_last_state = digitalRead(AJAR_PIN);
+}
+
+boolean get_ajar_status()  // shut = true, ajar = false
+{
+  if(digitalRead(AJAR_PIN))
+     return false;
+     
+  return true;
+}
+
+//**********//
+
 void init_manual()
 {
   pinMode(MANUAL_OPEN_PIN, INPUT);      // set pin to input
@@ -369,7 +390,11 @@ ISR(TIMER1_COMPA_vect)
       Serial.print("opened");
     else if(is_closed())
       Serial.print("closed");
-    Serial.println(", idle");
+    Serial.print(", idle");
+    if(get_ajar_status())
+      Serial.println(", shut");
+    else
+      Serial.println(", ajar");
     return;
   }
   else if(current_state == ERROR) {
@@ -436,12 +461,19 @@ 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();
-  else if(heartbeat_cnt >= HEARTBEAT_DELAY) {
+    if(a != ajar_last_state) 
+      ajar_state_changed = true;
+    ajar_last_state = a;
+  } else if(heartbeat_cnt >= HEARTBEAT_DELAY) {
     heartbeat_on();
     heartbeat_cnt = 0;
+    if(a != ajar_last_state)
+      ajar_state_changed = true;
+    ajar_last_state = a;
   }
 }
 
@@ -493,13 +525,16 @@ void print_status()
     Serial.print("<->");
 
   switch(current_state) {
-  case IDLE: Serial.println(", idle"); break;
-  case OPENING: Serial.println(", opening"); break;
-  case CLOSING: Serial.println(", closing"); break;
-  case WAIT: Serial.println(", waiting"); break;
-  default: Serial.println(", <undefined state>"); break;
+  case IDLE: Serial.print(", idle"); break;
+  case OPENING: Serial.print(", opening"); break;
+  case CLOSING: Serial.print(", closing"); break;
+  case WAIT: Serial.print(", waiting"); break;
+  default: Serial.print(", <undefined state>"); break;
   }
-  
+  if(get_ajar_status())
+    Serial.println(", shut");
+  else
+    Serial.println(", ajar");
 }
 
 //**********//
@@ -507,6 +542,7 @@ void print_status()
 void setup()
 {
   init_limits();
+  init_ajar();
   init_stepper();
   init_leds();
   init_heartbeat();
@@ -523,6 +559,7 @@ void setup()
     current_state = CLOSING;
     start_step_timer();
   }
+  Serial.println("init complete");
 }
 
 void loop()
@@ -538,8 +575,8 @@ void loop()
     }
     else if (command == CMD_OPEN) {
       if(current_state == IDLE) {
-	if(is_opened())
-	  Serial.println("Already open");
+        if(is_opened())
+          Serial.println("Already open");
         else {
           start_open();
           Serial.println("Ok");
@@ -550,8 +587,8 @@ void loop()
     }
     else if (command == CMD_CLOSE) {
       if(current_state == IDLE) {
-	if(is_closed())
-	  Serial.println("Already closed");
+        if(is_closed())
+          Serial.println("Already closed");
         else {
           start_close();
           Serial.println("Ok");
@@ -562,11 +599,11 @@ void loop()
     }
     else if (command == CMD_TOGGLE) {
       if(current_state == IDLE) {
-	if(is_closed())
-	  start_open();
-	else
-	  start_close();
-	Serial.println("Ok");
+        if(is_closed())
+          start_open();
+        else
+          start_close();
+        Serial.println("Ok");
       }
       else
         Serial.println("Error: Operation in progress");
@@ -584,7 +621,7 @@ void loop()
     Serial.println("close forced manually");
     start_close();
   }
-  if (current_state == IDLE) {
+  if(current_state == IDLE) {
     if(is_opened()) {
       leds_green();
       PORTD = LEDS_ON;
@@ -594,4 +631,8 @@ void loop()
       PORTD = LEDS_ON;
     }
   }
+  if(ajar_state_changed) {
+    ajar_state_changed = false;
+    print_status();
+  }
 }