Ryan Yuyuenyongwatana / capstone_display_2

Give me permissions so I don't have to fork.

Dependencies:   TFTLCD

Dependents:   Capstone

Fork of capstone_display by James Moffat

Files at this revision

API Documentation at this revision

Revision 1:a6f341df1ef1, committed 2014-04-03

Comitter:
jmoffat
Date:
Thu Apr 03 20:24:36 2014 +0000
Parent:
0:6846cd4549ba
Child:
2:c3231b95aff0
Commit message:
Mostly finished. Have added the functions for displaying strength and dist, though minor mods may be needed. Also need to add calibration screens.

Changed in this revision

display.cpp Show annotated file Show diff for this revision Revisions of this file
display.h Show annotated file Show diff for this revision Revisions of this file 
--- a/display.cpp	Mon Mar 24 23:59:30 2014 +0000
+++ b/display.cpp	Thu Apr 03 20:24:36 2014 +0000
@@ -7,14 +7,14 @@
     lcd = disp;
     lcd->Initialize();
     lcd->ClearScreen();
-    strength = " ";
+    
 }
 void display::print(char *str)
 {
     lcd->SetFont( &TerminusFont );
     lcd->SetForeground(COLOR_BLACK);
-    lcd->Print(strength, CENTER, 50);
-    strength = str;
+    lcd->Print(debugstr, CENTER, 50);
+    debugstr = str;
     lcd->SetForeground(COLOR_WHITE);
     lcd->Print(str, CENTER, 50);
 }
@@ -42,12 +42,27 @@
     lcd->Print(str, CENTER, 55);    
 }
 
-void display::displayStr(double dNewStrength)
+void display::displayStr(char *newStrength)
 {
     lcd->SetForeground(COLOR_BLACK);
-   // lcd->Print("Strength: "+strength, CENTER, 25);
-    //strength = to_string(dNewStrength);
+    lcd->Print("Strength: ", LEFT, 25);
+    lcd->Print(strength, CENTER, 25);
+    strength = newStrength;
     lcd->SetForeground(COLOR_WHITE);
-    //lcd->Print("Strength: "+newstr, CENTER, 25);
+    lcd->Print("Strength: ", LEFT, 25);
+    lcd->Print(strength, CENTER, 25);
+    
+}
+
+void display::displayDist(char *newDist)
+{
+    lcd->SetForeground(COLOR_BLACK);
+    lcd->Print("Dist: ", LEFT, 75);
+    lcd->Print(dist, CENTER, 75);
+    dist = newDist;
+    lcd->SetForeground(COLOR_WHITE);
+    lcd->Print("Dist: ", LEFT, 75);
+    lcd->Print(dist, CENTER, 75);    
+    
     
 }
\ No newline at end of file

--- a/display.h	Mon Mar 24 23:59:30 2014 +0000
+++ b/display.h	Thu Apr 03 20:24:36 2014 +0000
@@ -3,6 +3,7 @@
 class display
 {
     ST7735_LCD *lcd;
+    char *debugstr;
     char *strength;
     char *dist;
     
@@ -16,5 +17,7 @@
     
     void blinktext(const char *str);
     
-    void displayStr(double strength);
+    void displayStr(char *newStrength);
+    
+    void displayDist(char * newDist);
 };
\ No newline at end of file