Diff: main.cpp

Revision:

5:f655435d0782

Parent:

4:01252f56e0e5

Child:

7:5ef312aa2678

--- a/main.cpp	Fri Mar 18 17:05:22 2016 +0000
+++ b/main.cpp	Fri Mar 25 13:36:14 2016 +0000
@@ -3,7 +3,6 @@
 
 #include "global.h"
 #include "robot.h"
-#include "response.h"
 #include "tuning.h"
 
 
@@ -12,14 +11,10 @@
 enum Mode {
     AUTO_TRACK = '0', 
     MANUAL_CONTROL = '1', 
-    MOTOR_RESPONSE = '2',
-    SPEED_RESPONSE = '3',
-    STEERING_RESPONSE = '4',
-    TILT_RESPONSE = '5',
-    MOTOR_TUNING = '6',
-    SPEED_TUNING = '7',
-    STEERING_TUNING = '8',
-    TILT_TUNING = '9'
+    MOTOR_TUNING = '2',
+    SPEED_TUNING = '3',
+    STEERING_TUNING = '4',
+    TILT_TUNING = '5'
 };
 
 void PrintMenu(Serial *pc);
@@ -50,18 +45,6 @@
             case MANUAL_CONTROL: 
                 ManualControl();
                 break;
-            case MOTOR_RESPONSE: 
-                MotorResponse();
-                break;
-            case SPEED_RESPONSE: 
-                SpeedResponse();
-                break;
-            case STEERING_RESPONSE: 
-                SteeringResponse();
-                break;
-            case TILT_RESPONSE: 
-                TiltResponse();
-                break;
             case MOTOR_TUNING: 
                 MotorTuning();
                 break;
@@ -72,7 +55,7 @@
                 SteeringTuning();
                 break;
             case TILT_TUNING: 
-                TiltTuning(); 
+                TiltTuning();
                 break;
             default:
                 pc.printf("Error: Invalid Selection \r\n\r\n");
@@ -91,14 +74,10 @@
     pc->printf("---------------------------------------------------------------- \r\n");
     pc->printf("0. Automated Tracking \r\n");
     pc->printf("1. Manual Control \r\n");
-    pc->printf("2. Motor Response \r\n");
-    pc->printf("3. Speed Response \r\n");
-    pc->printf("4. Steering Response \r\n");
-    pc->printf("5. Tilt Response \r\n");
-    pc->printf("6. Motor Tunning  \r\n");
-    pc->printf("7. Speed Tunning \r\n");
-    pc->printf("8. Steeing Tunning \r\n");
-    pc->printf("9. Tilit Tunning \r\n");
+    pc->printf("2. Motor Tuning \r\n");
+    pc->printf("3. Speed Tuning \r\n");
+    pc->printf("4. Steering Tuning \r\n");
+    pc->printf("5. Tilt Tuning \r\n");
     pc->printf("---------------------------------------------------------------- \r\n\r\n");
     
     pc->printf("=> ");