Diff: sensor_measure.h

Revision:

32:d1dc27f4a18d

Parent:

30:307b45a52401

Child:

37:c0fddc75c862

--- a/sensor_measure.h	Mon Mar 23 16:44:55 2015 +0000
+++ b/sensor_measure.h	Tue Mar 24 12:29:58 2015 +0000
@@ -65,26 +65,26 @@
     int arrayBuilder = 0; //integer solely used for populating the array
     //right_right
     right_right_up.pin = &pin_right_right_up;
-    right_right_up.blackValue = 8500*BLACK_THRESHOLD;
-    right_right_up.whiteValue = 37000;
+    right_right_up.blackValue = 13000*BLACK_THRESHOLD;
+    right_right_up.whiteValue = 72000;
     right_right_up.grayValue = 0; // 0 for all the non-square sensors
     right_right_up.state = 0; //setting all sensors as black at begging
     sensorArray [arrayBuilder++] = &right_right_up; //Array goes from rightmost to left, then centre?
     right_left_up.pin = &pin_right_left_up;
-    right_left_up.blackValue = 10500*BLACK_THRESHOLD;
-    right_left_up.whiteValue = 37000;
+    right_left_up.blackValue = 11500*BLACK_THRESHOLD;
+    right_left_up.whiteValue = 70000;
     right_left_up.grayValue = 0;
     right_left_up.state = 1;
     sensorArray [arrayBuilder++] = &right_left_up;
     right_right_down.pin = &pin_right_right_down;
-    right_right_down.blackValue = 1500*BLACK_THRESHOLD;
-    right_right_down.whiteValue = 7300;
+    right_right_down.blackValue = 2000*BLACK_THRESHOLD;
+    right_right_down.whiteValue = 12000;
     right_right_down.grayValue = 0;
     right_right_down.state = 0;
     sensorArray [arrayBuilder++] = &right_right_down;
     right_left_down.pin = &pin_right_left_down;
     right_left_down.blackValue = 2500*BLACK_THRESHOLD;
-    right_left_down.whiteValue = 11000;
+    right_left_down.whiteValue = 17000;
     right_left_down.grayValue = 0;
     right_left_down.state = 1;
     sensorArray[arrayBuilder++] = &right_left_down;
@@ -95,20 +95,20 @@
     left_right_down.state = 1;
     sensorArray [arrayBuilder++] = &left_right_down;
     left_left_down.pin = &pin_left_left_down;
-    left_left_down.blackValue = 4500*BLACK_THRESHOLD;
-    left_left_down.whiteValue = 18000;
+    left_left_down.blackValue = 3000*BLACK_THRESHOLD;
+    left_left_down.whiteValue = 10000;
     left_left_down.grayValue = 0;
     left_left_down.state = 0;
     sensorArray [arrayBuilder++] = &left_left_down;
     left_right_up.pin = &pin_left_right_up;
-    left_right_up.blackValue = 11500*BLACK_THRESHOLD; //??? it's a trick ;)
-    left_right_up.whiteValue =  63000;
+    left_right_up.blackValue = 9500*BLACK_THRESHOLD; //??? it's a trick ;)
+    left_right_up.whiteValue =  35000;
     left_right_up.grayValue = 0;
     left_right_up.state = 1;
     sensorArray [arrayBuilder++] = &left_right_up;
     left_left_up.pin = &pin_left_left_up;
-    left_left_up.blackValue = 20000*BLACK_THRESHOLD;
-    left_left_up.whiteValue = 80000;
+    left_left_up.blackValue = 12000*BLACK_THRESHOLD;
+    left_left_up.whiteValue = 46000;
     left_left_up.grayValue = 0;
     left_left_up.state = 0;
     sensorArray [arrayBuilder++] = &left_left_up;
@@ -139,7 +139,8 @@
     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;
+//    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