Diff: localization.cpp

Revision:

4:5c1de47812db

Parent:

2:e9d692eea8de

Child:

5:dcce3f262830

diff -r c749f7b2e12c -r 5c1de47812db localization.cpp
--- a/localization.cpp	Mon Apr 18 23:06:13 2016 +0000
+++ b/localization.cpp	Wed Apr 20 00:31:22 2016 +0000
@@ -8,8 +8,8 @@
 }
 
 BNO055 imu(p9, p10); 
-ultrasonic mu1(p28, p27, .1, 1, &dist);
-ultrasonic mu2(p30, p29, .1, 1, &dist);
+//ultrasonic mu1(p28, p27, .1, 1, &dist);
+//ultrasonic mu2(p30, p29, .1, 1, &dist);
 
 localization::localization(){
     X = 0;
@@ -17,8 +17,8 @@
 }
 
 void localization::reset(){
-    mu1.startUpdates();//start mesuring the distance
-    mu2.startUpdates();
+    //mu1.startUpdates();//start mesuring the distance
+    //mu2.startUpdates();
     imu.reset();
     // Check that BNO055 is connected
     if (!imu.check()){
@@ -63,6 +63,7 @@
     #endif
 }
 
+/*
 void localization::measure(){
     while(1){
         imu.setmode(OPERATION_MODE_NDOF);
@@ -96,6 +97,7 @@
     //printf("Y is %dmm\r\n", Y);
     //wait(0.1);
 }
+*/
 
 int localization::getX(){
     return X;