Diff: main.cpp

Revision:

10:d0109d7cbe7c

Parent:

9:1cc27f33d3e1

Child:

11:b91fe0ed4fed

--- a/main.cpp	Mon Jul 10 16:23:52 2017 +0000
+++ b/main.cpp	Mon Jul 10 18:03:19 2017 +0000
@@ -4,7 +4,7 @@
     
     //defaultXWorld, defaultYWorld, defaultThetaWorld, widthRealMap, heightRealMap
     //middle arena ISR 60,40
-    MiniExplorerCoimbra myRobot(20,15,0,120,80);//0,0,0 : lower left, facing right
+    //MiniExplorerCoimbra myRobot(20,15,0,120,80);//0,0,0 : lower left, facing right
     
     //test lab1
     //MiniExplorerCoimbra myRobot(60,40,0,120,80);//0,0,0 : lower left, facing right
@@ -15,6 +15,7 @@
     //gain distance line
     //myRobot.go_to_point_with_angle_first_lab(100,55,-3.14/2);//SELECT A TARGET BETWEEN (0,0) and(widthRealMap,heightRealMap)
     //small gain orientation
+    
     //test lab2
     //reminder for now the sonar is in debugged, if no problem,comment the right code for presentaiton
     //MiniExplorerCoimbra myRobot(60,40,0,120,80);//0,0,0 : lower left, facing right
@@ -22,12 +23,14 @@
      //myRobot.test_procedure_lab2(10);
     
     //test lab3
-    myRobot.try_to_reach_target(100,55);//need to adjust the constants. 
+    //MiniExplorerCoimbra myRobot(20,15,0,120,80);//0,0,0 : lower left, facing right
+    //myRobot.try_to_reach_target(100,55);//need to adjust the constants. 
      
      //test lab4
-     //MiniExplorerCoimbra myRobot(20,10,0,120,80);//0,0,0 : lower left, facing right
+     MiniExplorerCoimbra myRobot(20,15,0,120,80);//0,0,0 : lower left, facing right
      //rectangle 100 width, 60 height 
      //myRobot.test_prediction_sonar();
+     myRobot.test_procedure_lab_4(50,0);
      
     return 0;
 }