Diff: main.cpp

Revision:

22:dd9ff475b34c

Parent:

20:70c5b1e499f0

Child:

23:bab197887d5e

--- a/main.cpp	Sun Oct 02 21:22:04 2016 +0000
+++ b/main.cpp	Mon Oct 03 00:31:36 2016 +0200
@@ -24,7 +24,12 @@
 float ySP = 50;
 float y = 0;
 
-int Ts = 0;
+float P = 0;
+float I = 0;
+float D = 0;
+float Ts = 0;
+
+int MeasuredTs = 0;
 
 bool started = true;
 
@@ -82,7 +87,7 @@
           activeScreen = new ManualControlScreen(&nextScreen, &alpha, &beta);
           break;
         case Screen::AUTOMATIC_CONTROL_SCREEN :
-          activeScreen = new AutomaticControlScreen(&nextScreen, &x, &y, &Ts, &started, &ballOnPlate, &xSP, &ySP);
+          activeScreen = new AutomaticControlScreen(&nextScreen, &x, &y, &measuredTs, &started, &ballOnPlate, &xSP, &ySP);
           break;
         case Screen::AUTOMATIC_MORE_SCREEN :
           activeScreen = new AutomaticMoreScreen(&nextScreen);
@@ -90,6 +95,8 @@
         case Screen::MANUAL_SETPOINT_SCREEN :
           activeScreen = new ManualSetpointScreen(&nextScreen, &xSP, &ySP);
           break;
+        case Screen::AUTOMATIC_SETTINS_SCREEN :
+          activeScreen = new AutomaticSettingsScreen(&nextScreen, &P, &I, &D, &Ts);
       }
 
       activeScreen->Draw();