Diff: main.cpp

Revision:

19:05b8123905fb

Parent:

18:501f1007a572

--- a/main.cpp	Thu Apr 07 13:19:29 2016 +0000
+++ b/main.cpp	Mon Apr 24 21:37:50 2017 +0000
@@ -4,25 +4,7 @@
 #include "global.h"
 #include "robot.h"
 
-// Definitions 
-// ----------------------------------------------------------------
-enum Mode {
-    AUTO_TRACK = '0', 
-    MANUAL_CONTROL = '1', 
-    SYSTEM_TUNING = '2'
-};
-
-void PrintMenu(Serial *pc);
-
-
-// Wiring - TODO
-// ----------------------------------------------------------------
-//
-//
-//
-//
-//
-//
+void PrintMenu(void);
 
 // Main Program
 // ----------------------------------------------------------------
@@ -31,14 +13,14 @@
     InitRobot();
 
     while (1) {
-        PrintMenu(&pc);
+        PrintMenu();
         mode = pc.getc();
         pc.printf("\r\n\r\n");
-        if ((mode == '0')||(mode == 'a')) {
+        if (mode == 'a') {
             AutoTrack();
-        } else if ((mode == '1')||(mode == 'm')) {
+        } else if (mode == 'm') {
             ManualControl();
-        } else if (mode == '2') {
+        } else if (mode == 't') {
             Tunning();
         } else {
             pc.printf("Error: Invalid Selection \r\n\r\n");
@@ -49,15 +31,15 @@
 
 // Other Functions
 // ----------------------------------------------------------------
-void PrintMenu(Serial *pc){
-    pc->printf("\e[1;1H\e[2J");
-    pc->printf("Select Mode: \r\n\r\n");
+void PrintMenu(){
+    pc.printf("\e[1;1H\e[2J");
+    pc.printf("Select Mode: \r\n\r\n");
     
-    pc->printf("---------------------------------------------------------------- \r\n");
-    pc->printf("0. Automated Tracking \r\n");
-    pc->printf("1. Manual Control \r\n");
-     pc->printf("2. System Tuning \r\n");
-    pc->printf("---------------------------------------------------------------- \r\n\r\n");
+    pc.printf("---------------------------------------------------------------- \r\n");
+    pc.printf("a. Automated Tracking \r\n");
+    pc.printf("m. Manual Control \r\n");
+    pc.printf("t. System Tuning \r\n");
+    pc.printf("---------------------------------------------------------------- \r\n\r\n");
     
-    pc->printf("=> ");
+    pc.printf("=> ");
 }