Michel Dequick / DisplayDriver

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:   TextLCD

Files at this revision

API Documentation at this revision

Revision 7:f2050f77de0b, committed 2017-05-15

Comitter:
atomicLogic
Date:
Mon May 15 18:29:40 2017 +0000
Parent:
6:658fac9f3ffd
Commit message:
bla

Changed in this revision

Display.cpp Show annotated file Show diff for this revision Revisions of this file
TextLCD.lib Show annotated file Show diff for this revision Revisions of this file 
diff -r 658fac9f3ffd -r f2050f77de0b Display.cpp
--- a/Display.cpp	Mon May 15 18:15:46 2017 +0000
+++ b/Display.cpp	Mon May 15 18:29:40 2017 +0000
@@ -168,8 +168,9 @@
     if( this->status == 3 )
     {
     
+    
+    Display::clearScreen();
     Display::topBar( 1 );
-    Display::clearScreen();
     
     lcd->locate( 0, 1 );
     lcd->printf( description.c_str() );
@@ -177,7 +178,7 @@
     char buffer[10];
     std::string distanceString = "";
     distanceString.append( "Dist:" );
-    std::sprintf(buffer, "%d", radius);
+    std::sprintf(buffer, "%d", distance);
     distanceString.append( std::string(buffer) );
     distanceString.append( "m" );
     
@@ -187,7 +188,7 @@
     char buffer2[10];
     std::string radString = "";
     radString.append( "Rad:" );
-    std::sprintf(buffer2, "%d", distance);
+    std::sprintf(buffer2, "%d", radius);
     radString.append( std::string(buffer2) );
     radString.append( "m" );
     
@@ -329,8 +330,8 @@
         break;
       case 2:
             {
-                this->status = 3;
-                Display::setMissionScreen( this->description, this->distance, this->radius );
+                this->status = 1;
+                Display::setMenuScreen();
             }
         break;
       case 3:
@@ -343,8 +344,8 @@
 
 void Display::setStatusScreen( void )
 {
+    Display::clearScreen();
     Display::topBar( 1 );
-    Display::clearScreen();
     
     lcd->locate(0,2);
     lcd->printf( "Battery" );

diff -r 658fac9f3ffd -r f2050f77de0b TextLCD.lib
--- a/TextLCD.lib	Mon May 15 18:15:46 2017 +0000
+++ b/TextLCD.lib	Mon May 15 18:29:40 2017 +0000
@@ -1,1 +1,1 @@
-https://developer.mbed.org/users/atomicLogic/code/TextLCD/#8ba443e7fdca
+https://developer.mbed.org/users/atomicLogic/code/TextLCD/#5f557ed7ca4e