Diff: irpair.cpp

Revision:

32:69acb14778ea

Parent:

29:ec2c5a69acd6

Child:

33:68ce1f74ab5f

--- a/irpair.cpp	Wed May 24 21:47:21 2017 +0000
+++ b/irpair.cpp	Fri May 26 03:46:03 2017 +0000
@@ -1,28 +1,38 @@
 #include "irpair.h"
 #include "mbed.h"
 
-Ticker toggleIr;
+//Ticker toggleIr;
+
+#define dark_samples 10
+#define busy_wait 10
 
 void IRPair::calibrateSensor() {
 
     ir.write( 1 );
-    wait_us(70);
+    wait_us(55);
 
     for (int i = 0; i < samplesToTake; ++i) 
         sensorAvg += recv.read();
         
     ir.write( 0 );
     sensorAvg /= samplesToTake;
+    wait_us(5);
 }
 
-float IRPair::getSamples( int samples )
+double IRPair::getSamples( int samples )
 {
-    float z = 0;
+    double z = 0;
+    
+    ir.write( 0 );
+    //for( int i = 0; i < dark_samples; i++ )
+    //    z1 += recv.read();
+    
     ir.write( 1 );
-    wait_us(70);
+    wait_us(55);
     
     for( int i = 0; i < samples; ++i )
         z += recv.read();
     ir.write( 0 );
+    wait_us(5);
     return z / samples;
 }
\ No newline at end of file