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/ManualSetpointScreen.cpp

Revision:
51:7760463a13d1
Parent:
26:f57db8d6d79e
Child:
52:c9e1974ae332
--- a/Screens/ManualSetpointScreen.cpp	Tue Oct 18 02:11:07 2016 +0200
+++ b/Screens/ManualSetpointScreen.cpp	Tue Oct 18 02:23:43 2016 +0200
@@ -4,7 +4,7 @@
   Screen(),
   _lbTitle( SCREEN_W/2, 0, "Manual Setpoint", Label::CENTER, Font24),
   _btBack( 0, SCREEN_H-30, 100, 30, "Back"),
-  _tpSetpoint( (SCREEN_W/2)-90 ,57, 180,180, -120.0, 120.0, -136,136),
+  _tpSetpoint( (SCREEN_W/2)-90 ,57, 180,180, -100.0, 100.0, -100.0 ,100.0),
   _btStart( 110, SCREEN_H-30, SCREEN_W-220, 30, "Start"),
   _btStop( 110, SCREEN_H-30, SCREEN_W-220, 30, "Stop"),
   _nlbXSP(0,26,"x (mm)=%.0f",*xSP),
@@ -46,8 +46,8 @@
   {
     _tpSetpoint.Update();
 
-    *_xSP = floor(_tpSetpoint.GetX());
-    *_ySP = floor(_tpSetpoint.GetY());
+    *_ySP = floor(_tpSetpoint.GetX());
+    *_xSP = floor(_tpSetpoint.GetY());
     _nlbXSP.Draw("x (mm)=%.0f",*_xSP);
     _nlbYSP.Draw("y (mm)=%.0f",*_ySP);
   }
@@ -59,8 +59,6 @@
 
     *_xSP = floor(_tpSetpoint.GetX());
     *_ySP = floor(_tpSetpoint.GetY());
-    _nlbXSP.Draw("x (mm)=%.0f",*_xSP);
-    _nlbYSP.Draw("y (mm)=%.0f",*_ySP);
   }
 
   if( _btStart.IsActive() )