Cornelius Bezuidenhout / Mbed OS Heiko

Important changes to repositories hosted on mbed.com

Mbed hosted mercurial repositories are deprecated and are due to be permanently deleted in July 2026.

To keep a copy of this software download the repository Zip archive or clone locally using Mercurial.

It is also possible to export all your personal repositories from the account settings page.

Dependencies:   BSP_DISCO_F746NG F746_GUI LCD_DISCO_F746NG SDFileSystem TS_DISCO_F746NG ResistiveTouchController Map CYS8218Controller MedianFilter

Diff: main.cpp

Revision:
38:f1c571d22919
Parent:
37:93c7563f2078
Child:
39:7bb23ad4bf87
--- a/main.cpp	Mon Oct 03 18:14:33 2016 +0200
+++ b/main.cpp	Sat Oct 08 18:40:44 2016 +0200
@@ -34,7 +34,7 @@
 int calPoint = 0;
 bool calStarted = false;
 Timer calTimer;
-float calHeldTime;]
+float calHeldTime;
 bool calFinished = false;
 
 int measuredTs = 0;
@@ -122,7 +122,7 @@
           activeScreen = new ChangeValWholeScreen(&nextScreen, currentScreen, &Ts, "Change Ts", false, 4);
           break;
         case Screen::CALIBRATE_SCREEN :
-          activeScreen = new CalibrateScreen(&nextScreen, &ballOnPlate, &calStarted, &calPoint, &calHeldTime);
+          activeScreen = new CalibrateScreen(&nextScreen, &ballOnPlate, &calStarted, &calFinished, &calPoint, &calHeldTime);
           break;
       }
 
@@ -139,8 +139,12 @@
 
 void Init()
 {
+  ImageFromSD("Splash.txt");
   pc.baud(57600);
   nextScreen = Screen::MAIN_MENU_SCREEN;
+
+  Thread::wait(5000);
+
   guiThread.start(GUIThread);
 }