Cornelius Bezuidenhout / Mbed OS Heiko

Dependencies:   BSP_DISCO_F746NG F746_GUI LCD_DISCO_F746NG SDFileSystem TS_DISCO_F746NG ResistiveTouchController Map CYS8218Controller MedianFilter

Revision:
37:93c7563f2078
Parent:
35:6baa558d3b86
diff -r 9ca4125e526e -r 93c7563f2078 Screens/CalibrateScreen.hpp
--- a/Screens/CalibrateScreen.hpp	Mon Oct 03 17:43:28 2016 +0200
+++ b/Screens/CalibrateScreen.hpp	Mon Oct 03 18:14:33 2016 +0200
@@ -7,7 +7,7 @@
 class CalibrateScreen : public Screen
 {
 public:
-  CalibrateScreen(int *nextScreen, int *ballOnPlate, bool *calStarted, int *calPoint, float *calHeldTime);
+  CalibrateScreen(int *nextScreen, int *ballOnPlate, bool *calStarted, bool *calFinished, int *calPoint, float *calHeldTime);
 
   void Draw();
   void Process();
@@ -20,7 +20,8 @@
   int *_ballOnPlate;
   int *_calPoint;
   bool *_calStarted;
-  int *_calHeldTime;
+  bool *_calFinished;
+  float *_calHeldTime;
   char _message[50];
 
   void DisplayMessage();