Team Design project 3 main file

Dependencies:   mbed Motor_Driver Sensors MMA8451Q LocalPositionSystem

Fork of TDP_main by Ivelin Kozarev

Revision:
20:e8da3b351cd0
Parent:
18:d277614084bc
Child:
21:9cf274ffe1de
--- a/sensor_measure.h	Fri Mar 20 11:40:57 2015 +0000
+++ b/sensor_measure.h	Fri Mar 20 14:56:13 2015 +0000
@@ -139,21 +139,22 @@
     freq = (1/period);   // Convert period (in us) to frequency (Hz). 
     //pc.printf(" period is  %f  and freq is  %f ", period,freq); // Used for debugging
     
-    //sensor->state = freq;
+    sensor->state = freq;
+    return 0;
     
 //    if (sensor->grayValue != 0 && freq < (sensor->grayValue +  1000) && freq > (sensor.grayValue - 1000)) { //definitely not sure about that!
 //        //this is a gray value sensor in its gray region
 //        sensor->state = 2;
 //        return 2;
 //    }
-    if (freq < (2*sensor->blackValue)){
-        sensor->state = 0;    //if it's less than black value it is black
-        return 0;
-    }
-    else {
-        sensor->state = 1;
-    }    
-        return 1;
+//    if (freq < (2*sensor->blackValue)){
+//        sensor->state = 0;    //if it's less than black value it is black
+//        return 0;
+//    }
+//    else {
+//        sensor->state = 1;
+//    }    
+//        return 1;
    //(freq < sensor->black_value*2)? 1 : 0; //freq
 }
 #endif
\ No newline at end of file