Diff: Calculate.cpp

Revision:

30:ab3a436e8968

Parent:

26:4289549b2d21

Child:

31:bea1117f14fb

--- a/Calculate.cpp	Tue Jul 07 14:56:29 2015 +0000
+++ b/Calculate.cpp	Wed Jul 08 07:47:28 2015 +0000
@@ -5,35 +5,33 @@
  //mbed pins
 extern Serial pc;                                                                   //defines the communication between MBed and pc
 int NoOfPins = 6;                                                                         //for how many sensors there are       
-DigitalIn sensor[6] = {p8,p9,p10,p11,p12,p13};                                                       //array of sensors.   
+DigitalIn sensor[6] = {p5,p6,p7,p8,p9,p10} ;                                                 //array of sensors.   
 //c++ variables
     time_t sensor_time ;                            //time at which sensor is broken
     double timeDifference;                          //time between 2 sensors - not used right now
     double times[6];                                //array the size of #pins
                                                   
-int calculate()                                                          //the one method
+int calculate()
 {
     pc.printf("new program \n");                                            //alert user of initialisation   
       
-    int i = 0;                                                              //for counter
-    while( i < NoOfPins)                                                    //for every pin
+    int i = 0; 
+    while( i < 6)
     {
-        while(!sensor[i])                                                   //while not pin. while loop ends after last sensor
+        while(!sensor[i]) 
         {
-            if(sensor[i + 1]) {                                             //error bypassing measures incase one is missed will continue as normal
-                sensor_time = time(NULL);                                       //get time
-                i++;                                                           //error bypassing incase next one is done
-                }                                                         
+            if(sensor[i + 1]) {
+                sensor_time = time(NULL); 
+                i++; 
+                }                                                         //error checking incase next one is done
         }
-        sensor_time = time(NULL);                                               //get time
-        pc.printf(" %dth sensor  %d : \t", i,sensor_time);                      //print time 
-        times[i] = sensor_time;                                                     //add tiem to the array
-        i++;                                                                      //move onto next sensor
-    }   
+        sensor_time = time(NULL); 
+        pc.printf(" %dth sensor  %d : \t", i,sensor_time);  
+        i++;
+    } 
       pc.printf("Calculate completed"); 
-      for (int i = 6 - 1; i >= 0; i--) {                 //code for printing the array times
-        pc.printf("%d", times[i]);                       //^
-        }
        
       
 }
+
+