Diff: main.cpp

Revision:

8:1b4e84f4c451

Parent:

7:316c2dac06a5

Child:

10:c8a6f2822068

--- a/main.cpp	Sun Sep 16 10:53:33 2012 +0000
+++ b/main.cpp	Sun Sep 16 20:17:01 2012 +0000
@@ -39,13 +39,15 @@
     error("Hard Fault!\n");
 }
 
-DigitalOut  led1(LED1);
+DigitalOut  led1(LED1);                     // LED 1 is used to show the state of the door. ON is door open, and OFF is door close.
 DigitalOut  led2(LED2);
-DigitalOut  led3(LED3);
+DigitalOut  led3(LED3);                     // LED 3 is use to indicate if the relay is being switched on to open the door
 DigitalOut  led4(LED4);
-DigitalOut  doorContactorRelay(p5);        // create a digital pin object to control the door contactor relay
-DigitalIn   doorProximitySwitch(p20);       // create a digital pin object to sense door position proximity switch
-
+DigitalOut  doorContactorRelay(p5);         // create a digital pin object to control the door contactor relay
+DigitalIn   doorProximitySwitch(p20);       // create a digital pin object to sense door position proximity switch, this works in reverse
+                                            // the switch senses positive when the door is closed - need to be sure when it's closed! :-)
+bool        openTheDoor = false;            // create a state variable which is set to indicate the mbed should open the door
+                                            // this variable will be used hold the latch open until it knows the door has been open.
 
 void test(void const*) {
   VodafoneK3770 connectionManager;                     // create a connection manager object
@@ -56,15 +58,35 @@
 
   while(true)
   {
-    char num[17];
-    char msg[160];
+    char num[17];                                           // create a buffer to hold the telephone number in
+    char msg[160];                                          // create a buffer to hold the text message in
     size_t count;
-    if (doorOpen)
+    
+    
+    // if this state variable has been set I need to keep the doorContactor on until the door is open
+    if ((openTheDoor) || (doorProximitySwitch.read() == 0))
     {
-        doorOpen = 0;
-        led3=0;
+        
+        doorContactorRelay = 0;                             // door must be open now so switch relay off.
+        openTheDoor = false;                                // the door is open now so set it to false.
+        led3 = 0;                                           // switch the LED light off to indicate I'm switching the relay off
+
+    }
     
+    // check the state of the door and switch the LED light to 'ON' for door open and 'OFF' for door closed.
+    if (doorProximitySwitch.read() == 0)
+    {
+        DBG("The door proximity switch is: %d so I think it's open", doorProximitySwitch.read() );
+        led1 = 1;
     }
+    else
+    {
+        DBG("The door proximity switch is: %d so I think it's closed", doorProximitySwitch.read() );
+        led1 = 0;
+    }
+    
+    
+ 
     int ret = connectionManager.getSMCount(&count);         // check to see if there is an incoming SMS message
     if(ret)
     {
@@ -72,10 +94,12 @@
       Thread::wait(3000);
       continue;
     }
+    
     if( count > 0)                                          // if there are messages in the mailbox start pulling them off the queue
     {
       DBG("%d SMS to read", count);
       ret = connectionManager.getSM(num, msg, 64);
+    
       if(ret)
       {
         WARN("getSM returned %d", ret);
@@ -85,23 +109,29 @@
 
       DBG("The message is from number: %s and the message is: \"%s\"", num, msg);
       
-      if (strcmp (msg, "open") ==0) {
+      if (strcmp (msg, "open") ==0) 
+      {
         DBG("The SMS message indicates I should open the door");
         
         // check the door is not already open if it is do nothing and send a warning back to the sender
         // for this door the switch 'true' then its closed - we have to have an active signal to show it's securely closed
+
         if ( doorProximitySwitch.read() == 0)
         {
             DBG("The door is already open - so I'll do nothing");
-            connectionManager.sendsm(num, " WARNING - The door is already open sir! ");
+            connectionManager.sendSM(num, " WARNING - The door is already open sir! ");
         }
         else
         {
             doorContactorRelay = 1;
+            openTheDoor = true;     // set the state vairable to let the door contoller know it needs to open the door
             led3 = 1;
             DBG("The relay has been activated to open the door");
-            connectionManager.sendsm(num, " Door open sir... Welcome home! " );
-      } else {
+            connectionManager.sendSM(num, " Door open sir... Welcome home! " );
+        }
+      } 
+      else 
+      {
         DBG("The SMS message is not recognized");
         connectionManager.sendSM(num, " Wrong password sir... Try 'open' and I'll open! ;-) ");
       }
@@ -117,7 +147,7 @@
 void keepAlive(void const*) {
    while(1)
    {
-     led1=!led1;
+     led2=!led2;
      Thread::wait(500);
    }
 }