Cornelius Bezuidenhout / Mbed OS Heiko

My final year project

Dependencies:   BSP_DISCO_F746NG F746_GUI LCD_DISCO_F746NG SDFileSystem TS_DISCO_F746NG ResistiveTouchController Map CYS8218Controller MedianFilter

Diff: main.cpp

Revision:
23:bab197887d5e
Parent:
22:dd9ff475b34c
Child:
25:bfff3d661f92
--- a/main.cpp	Mon Oct 03 00:31:36 2016 +0200
+++ b/main.cpp	Mon Oct 03 00:58:51 2016 +0000
@@ -29,7 +29,7 @@
 float D = 0;
 float Ts = 0;
 
-int MeasuredTs = 0;
+int measuredTs = 0;
 
 bool started = true;
 
@@ -93,9 +93,9 @@
           activeScreen = new AutomaticMoreScreen(&nextScreen);
           break;
         case Screen::MANUAL_SETPOINT_SCREEN :
-          activeScreen = new ManualSetpointScreen(&nextScreen, &xSP, &ySP);
+          activeScreen = new ManualSetpointScreen(&nextScreen, &xSP, &ySP, &ballOnPlate, &started);
           break;
-        case Screen::AUTOMATIC_SETTINS_SCREEN :
+        case Screen::AUTOMATIC_SETTINGS_SCREEN :
           activeScreen = new AutomaticSettingsScreen(&nextScreen, &P, &I, &D, &Ts);
       }