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

Revision:
23:bab197887d5e
Parent:
22:dd9ff475b34c
Child:
26:f57db8d6d79e
--- a/Screens/AutomaticSettingsScreen.cpp	Mon Oct 03 00:31:36 2016 +0200
+++ b/Screens/AutomaticSettingsScreen.cpp	Mon Oct 03 00:58:51 2016 +0000
@@ -1,17 +1,18 @@
 #include "AutomaticSettingsScreen.hpp"
 
-AutomaticSettingsScreen::AutomaticSettingsScreen() :
+AutomaticSettingsScreen::AutomaticSettingsScreen(int *nextScreen, float *P, float *I, float *D, float *Ts) :
   Screen(),
   _lbTitle( SCREEN_W/2, 0, "Settings", Label::CENTER, Font24),
   _btBack( 0, SCREEN_H-30, 100, 30, "Back"),
-  _nlbP(0,26, "P =%.3f", *P);
+  _nlbP(0,26, "P =%.3f", *P, Label::LEFT, Font20),
   _btP(SCREEN_W/2, 26, 100, 30, "Change"),
-  _nlbI(0,61, "P =%.3f", *I);
+  _nlbI(0,61, "I =%.3f", *I,  Label::LEFT, Font20),
   _btI(SCREEN_W/2, 61, 100, 30, "Change"),
-  _nlbD(0,96, "P =%.3f", *D);
+  _nlbD(0,96, "D =%.3f", *D, Label::LEFT, Font20),
   _btD(SCREEN_W/2, 96, 100, 30, "Change"),
-  _nlbTs(0,131, "P =%.3f", *Ts);
-  _btTs(SCREEN_W/2, , 131, 30, "Change")
+  _nlbTs(0,131, "Cycle Time (ms)=%.0f", *Ts,  Label::LEFT, Font20),
+  _btTs(SCREEN_W/2, 131, 100, 30, "Change")
+  //TODO Improve layout of this screen
 {
   _nextScreen = nextScreen;
   _P = P;