Diff: elevator.cpp

Revision:

5:15bb8f6b6d85

Parent:

4:fba6c97a6192

Child:

6:1f9baf8d833e

--- a/elevator.cpp	Thu Oct 08 23:35:14 2015 +0000
+++ b/elevator.cpp	Fri Oct 09 00:03:10 2015 +0000
@@ -52,7 +52,7 @@
                 else if (frequency >= 600 && frequency <= 800){currentfloor = 4;led4 = 1;}
                 else if (frequency >= 400 && frequency <= 590){currentfloor = 3;led3 = 1;}
                 else if (frequency >= 200 && frequency <= 300){currentfloor = 2;led2 = 1;}
-                else if (frequency >= 50 && frequency <= 150){currentfloor = 1;led1 = 1;}
+                else if (frequency >= 50 && frequency <= 150){currentfloor = 1;}
         
                 if (currentfloor == requested_floor){
                     dc_motor.write(0.0f);
@@ -115,6 +115,7 @@
             closeDoor();
             moveDown();
             busy = 1;
+            led1 = 1;
             sensor.fall(&serve);
             }
             
@@ -122,6 +123,7 @@
             closeDoor();
             moveUp();
             busy = 1;
+            led1 = 1;
             sensor.fall(&serve);
             }
     }
@@ -155,18 +157,18 @@
         
         while(busy == 0){
         
-            if (an.read()*3.3f > 0.59f && an.read()*3.3f < 0.7f ){requested_floor1 = 1;}    
-            else if (an.read()*3.3f > 1.19f && an.read()*3.3f < 1.3f ){requested_floor1 = 2;} 
-            else if (an.read()*3.3f > 1.79f && an.read()*3.3f < 1.9f ){requested_floor1 = 3;} 
-            else if (an.read()*3.3f > 2.39f && an.read()*3.3f < 2.5f ){requested_floor1 = 4;} 
-            else if (an.read()*3.3f > 2.99f && an.read()*3.3f < 3.1f ){requested_floor1 = 5;}
+            if (an.read()*3.3f > 0.62f && an.read()*3.3f < 1.0f ){requested_floor1 = 1;}    
+            else if (an.read()*3.3f > 1.20f && an.read()*3.3f < 1.60f ){requested_floor1 = 2;} 
+            else if (an.read()*3.3f > 1.70f && an.read()*3.3f < 2.3f ){requested_floor1 = 3;} 
+            else if (an.read()*3.3f > 2.4f && an.read()*3.3f < 2.9f ){requested_floor1 = 4;} 
+            else if (an.read()*3.3f > 3.0f && an.read()*3.3f < 3.5f ){requested_floor1 = 5;}
             else{requested_floor1 = 0;}
             
-            if (an.read()*3.3f > 0.59f && an.read()*3.3f < 0.7f ){requested_floor2 = 1;}    
-            else if (an.read()*3.3f > 1.19f && an.read()*3.3f < 1.3f ){requested_floor2 = 2;} 
-            else if (an.read()*3.3f > 1.79f && an.read()*3.3f < 1.9f ){requested_floor2 = 3;} 
-            else if (an.read()*3.3f > 2.39f && an.read()*3.3f < 2.5f ){requested_floor2 = 4;} 
-            else if (an.read()*3.3f > 2.99f && an.read()*3.3f < 3.1f ){requested_floor2 = 5;}
+            if (an.read()*3.3f > 0.62f && an.read()*3.3f < 1.0f ){requested_floor2 = 1;}    
+            else if (an.read()*3.3f > 1.20f && an.read()*3.3f < 1.60f ){requested_floor2 = 2;} 
+            else if (an.read()*3.3f > 1.70f && an.read()*3.3f < 2.3f ){requested_floor2 = 3;} 
+            else if (an.read()*3.3f > 2.4f && an.read()*3.3f < 2.9f ){requested_floor2 = 4;} 
+            else if (an.read()*3.3f > 3.0f && an.read()*3.3f < 3.5f ){requested_floor2 = 5;}
             else{requested_floor2 = 0;}
             
             if (requested_floor1 != requested_floor2) {requested_floor = 0;}