Diff: main.cpp

Revision:

13:21dc070a47a9

Parent:

12:650ae2f4c7df

Child:

15:bc63b55a426d

--- a/main.cpp	Sun Oct 02 10:14:42 2016 +0200
+++ b/main.cpp	Sun Oct 02 11:39:42 2016 +0200
@@ -7,6 +7,7 @@
 
 void ZeroPlate();
 void Manual();
+void Automatic();
 
 int currentScreen = 0;
 int nextScreen = 0;
@@ -15,9 +16,19 @@
 
 float zeroAlpha = 0;
 float alpha = 0;
+float xSP = 0;
+float x = 0;
 
 float zeroBeta = 0;
 float beta = 0;
+float ySP = 0;
+float y = 0;
+
+int Ts = 0;
+
+bool started = false;
+
+int ballOnPlate = 0;
 
 bool saved = false;
 
@@ -37,6 +48,9 @@
       case Screen::MANUAL_CONTROL_SCREEN :
         Manual();
         break;
+      case Screen::AUTOMATIC_CONTROL_SCREEN :
+        Automatic();
+        break;
     }
   }
 }
@@ -64,6 +78,9 @@
         case Screem::MANUAL_CONTROL_SCREEN :
           activeScreen = new ManualControlScreen(&nextScreen, &alpha, &beta);
           break;
+        case Screen::AUTOMATIC_CONTROL_SCREEN :
+          activeScreen = new AutomaticControlScreen(&nextScreen, &x, &y, &Ts, &started. &ballOnPlate, &xSP, &ySp);
+          break;
       }
 
       activeScreen->Draw();
@@ -104,3 +121,10 @@
 {
   // TODO Add manual control logic
 }
+
+void Automatic()
+{
+  //TODO Add automatic control mode logic
+
+
+}