Mark Vandermeulen / FYDP_Final2

Dependencies:   Servo mbed

Revision:
3:47461d37adfb
Parent:
2:7b3822eacad8
--- a/bt_shell/shell/bt_shell.cpp	Sat Mar 21 22:44:36 2015 +0000
+++ b/bt_shell/shell/bt_shell.cpp	Sun Mar 22 00:43:42 2015 +0000
@@ -61,7 +61,7 @@
 void bt_shell_run(){
 
     static bool py_machine_input = false;   //this is for the python and brain file connection (not finished)
-    static bool ros_machine_input = false;  //this is for the connection to ROS
+    static bool ros_machine_input = true;  //this is for the connection to ROS
 send_flag=1; //always send stuff
     bt.lock();
     
@@ -127,7 +127,7 @@
             }
             if(obstacle_flag && fwd_flag && !calibrate_flag) 
             {
-                moveMotors(0,0,0);
+                //moveMotors(0,0,0);
                 obstacle_flag = 0;
                 send_flag = 0;
                 send_prev = 0;