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:
32:d490f8ca6d2a
Parent:
31:5ece593c49a7
Child:
34:0b308a399f72
--- a/main.cpp	Mon Oct 03 13:48:48 2016 +0200
+++ b/main.cpp	Mon Oct 03 15:55:55 2016 +0200
@@ -29,6 +29,8 @@
 float D = 0;
 float Ts = 4;
 
+float tCal[3][2];
+
 int measuredTs = 0;
 
 bool started = true;
@@ -110,6 +112,9 @@
         case Screen::CHANGE_TS_SCREEN :
           activeScreen = new ChangeValWholeScreen(&nextScreen, currentScreen, &Ts, "Change Ts", false, 4);
           break;
+        case Screen::CALIBRATE_SCREEN :
+          activeScreen = new CalibrateScreen(&nextScreen, tCal);
+          break;
       }
 
       activeScreen->Draw();