Revision 1:d4b4c89e4a43, committed 2015-04-13

Comitter:

hlekkala

Date:

Mon Apr 13 19:52:01 2015 +0000

Parent:

0:9de45e2c32dc

Commit message:

final

Changed in this revision

--- a/main.cpp	Tue Mar 31 03:43:30 2015 +0000
+++ b/main.cpp	Mon Apr 13 19:52:01 2015 +0000
@@ -53,13 +53,6 @@
                    }
             }        
         }    
-    //pc.printf("Queue : ");
-    /*
-    for(int m = 0; m<n; m++){
-        pc.printf("%d ",request[m]);
-        } */
-        //pc.printf("\r\n");
-    }
 
 void door_oc(){
     pc.printf("On floor : %d \r\n",numfloor); 
@@ -260,23 +253,12 @@
     
     servo1.period(0.020);   
     
-    //request.push_back(5);
-    //request.push_back(4);
-    //request.push_back(3);
-    //request.push_back(1); 
+    request.push_back(1); 
     
-    /*
-    row1 = 0;                   //row initialization
-    row2 = 0;
-    */
+    
     pc.printf("Start freq : %d\r\n", freq);
     pin.rise(&rise_edge);
-    /*
-    while(!(freq>90.0 && freq <110.0)){
-        m.speed(-1.0);
-        }
-    m.speed(0.0);
-    */
+    
     pc.printf("Start Now ............................. \r\n");
     while(1){   
           
@@ -293,9 +275,7 @@
                    while(diff > 0){
                        //pc.printf("DC ON +1 \r\n");
                        m.speed(1.0);
-                       //pc.printf("Service for : %d \r\n",numfloor);
-                       //pc.printf("Now at : %d \r\n",curfloor);
-                       //pc.printf("Going Up \r\n");
+                    
                        curfloor = floor_detect();
                        if(exist(curfloor)){
                            numfloor = curfloor;
@@ -321,11 +301,8 @@
                    numfloor = request[k];
                    diff = numfloor - curfloor;
                    while(diff < 0){
-                       //pc.printf("DC ON -1 \r\n");
                        m.speed(-1.0);
-                       //pc.printf("Service for : %d \r\n",numfloor);
-                       //pc.printf("Now at : %d \r\n",curfloor);
-                       //pc.printf("Going Down \r\n");
+                       
                        curfloor = floor_detect();
                        if(exist(curfloor)){
                            numfloor = curfloor;
@@ -347,44 +324,3 @@
     }
 }
 
-// Move 1
-/*            
-              for(int k = 0;k<request.size();k++){
-                   sort();
-                   numfloor = request[k];
-                   diff = numfloor - curfloor;
-                   while(diff > 0){
-                       //pc.printf("DC ON +1 \r\n");
-                       m.speed(1.0);
-                       //pc.printf("Service for : %d \r\n",numfloor);
-                       //pc.printf("Now at : %d \r\n",curfloor);
-                       //pc.printf("Going Up \r\n");
-                       curfloor = floor_detect();
-                       diff = numfloor - curfloor; 
-                       if(diff == 0){
-                           //wait(2);
-                           pc.printf("DC OFF \r\n");
-                           m.speed(0.0);
-                           request.erase(request.begin()+k);
-                           k--;
-                           door_oc();
-                           }
-                   }              
-                }   */  
-
-/*
-
-numfloor = floor_detect(); 
-                while(numfloor!=request[request.size()-1]){
-                        numfloor = floor_detect();
-                        diff = numfloor - curfloor;
-                        if(diff > 0){
-                            m.speed(1.0);
-                            if(exist(numfloor)){
-                                door_oc();
-                                
-                                }
-                            
-                            }
-                        
-                    } */
\ No newline at end of file