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: Screens/AutomaticControlScreen.cpp

Revision:
17:3b6d66253c97
Parent:
16:6b553c9008ec
Child:
18:1b9579ac9f41
--- a/Screens/AutomaticControlScreen.cpp	Sun Oct 02 10:17:55 2016 +0000
+++ b/Screens/AutomaticControlScreen.cpp	Sun Oct 02 10:43:13 2016 +0000
@@ -6,10 +6,10 @@
   _btBack( 0, SCREEN_H-30, 100, 30, "Back"),
   _btSettings(SCREEN_W-100, SCREEN_H-30, 100, 30, "Settings"),
   _btStart(0, SCREEN_H-65, SCREEN_W, 30, "Start"), //TODO Custom colors and disabled featrure
-  //_btStop(0, SCREEN_H-65, SCREEN_W, 30, "Start"), //TODO Custom colors
+  _btStop(0, SCREEN_H-65, SCREEN_W, 30, "Start"), //TODO Custom colors
   _btMore((SCREEN_W/2)-50, SCREEN_H-30, 100, 30, "More"),
   _nlbTs( SCREEN_W/2, 26, "Cycle Time (us):%d", *Ts, Label::CENTER),
-  _gXPos( 0, 40, SCREEN_W/2,  158, -170, 170, "X Position (mm)"),
+  _gXPos( 0, 40, SCREEN_W/2-1,  158, -170, 170, "X Position (mm)"),
   _gYPos( SCREEN_W/2+1, 40, SCREEN_W/2-1,  158, -136, 136, "Y Position (mm)")
 {
   _nextScreen = nextScreen;