GraphicsDisplay / UniGraphic

Basically i glued Peter Drescher and Simon Ford libs in a GraphicsDisplay class, then derived TFT or LCD class (which inherits Protocols class), then the most derived ones (Inits), which are per-display and are the only part needed to be adapted to diff hw.

Dependents:   testUniGraphic_150217 maze_TFT_MMA8451Q TFT_test_frdm-kl25z TFT_test_NUCLEO-F411RE ... more

Files at this revision

API Documentation at this revision

Revision 8:26757296c79d, committed 2015-02-17

Comitter:
Geremia
Date:
Tue Feb 17 17:54:14 2015 +0000
Parent:
7:bb0383b91104
Child:
9:1749ae993cfe
Commit message:
Fixed scroll for smaller area, better font spacing

Changed in this revision

Display/TFT.cpp Show annotated file Show diff for this revision Revisions of this file
Display/TFT.h Show annotated file Show diff for this revision Revisions of this file
Graphics/GraphicsDisplay.cpp Show annotated file Show diff for this revision Revisions of this file 
--- a/Display/TFT.cpp	Tue Feb 17 11:02:06 2015 +0000
+++ b/Display/TFT.cpp	Tue Feb 17 17:54:14 2015 +0000
@@ -207,14 +207,14 @@
     wr_cmd8(0x33);
     wr_data16(topfixedareasize); //num lines of top fixed area
     wr_data16(scrollareasize+scrollbugfix); //num lines of vertical scroll area, +1 for ILI9481 fix
-    if((areasize+startY)>height()) bfa=0;
-    else bfa = height()-(areasize+startY);
+    if((areasize+startY)>screensize_Y) bfa=0;
+    else bfa = screensize_Y-(areasize+startY);
     wr_data16(bfa); //num lines of bottom fixed area
 }
 void TFT::scroll (int lines) // ie 1= scrollup 1, 479= scrolldown 1
 {
     wr_cmd8(0x37);
-    wr_data16((topfixedareasize+lines)%scrollareasize); //num lines of top fixed area
+    wr_data16(topfixedareasize+(lines%scrollareasize)); // select the (absolute)line which will be displayed as first scrollarea line 
 }
 void TFT::scrollreset()
 {

--- a/Display/TFT.h	Tue Feb 17 11:02:06 2015 +0000
+++ b/Display/TFT.h	Tue Feb 17 17:54:14 2015 +0000
@@ -47,10 +47,10 @@
     */
     virtual void window(int x, int y, int w, int h);
     
-    /** Read pixel color at current location
+    /** Read pixel color at location
     * @param x is the horizontal offset to this pixel.
     * @param y is the vertical offset to this pixel.
-    * @param color defines the color for the pixel.
+    * @returns 16bit color.
     */
     virtual unsigned short pixelread(int x, int y);
     

--- a/Graphics/GraphicsDisplay.cpp	Tue Feb 17 11:02:06 2015 +0000
+++ b/Graphics/GraphicsDisplay.cpp	Tue Feb 17 17:54:14 2015 +0000
@@ -25,7 +25,7 @@
 #include "GraphicsDisplay.h"
 #define SWAP(a, b)  { a ^= b; b ^= a; a ^= b; }
 GraphicsDisplay::GraphicsDisplay(const char *name):TextDisplay(name) {
-    set_font((unsigned char*)Terminal6x8);
+    set_font((unsigned char*)Terminal6x8,32,127,true);
  //   foreground(0xFFFF);
  //   background(0x0000);
     char_x = 0;
@@ -299,8 +299,12 @@
             }
         }
     }
-    if(fontprop) char_x += w;
-    else char_x += fonthor;
+    if(fontprop)
+    {
+        if((w+1)<fonthor) char_x += w+1; // put at least 1 blank after variable-width characters, except characters that occupy whole fonthor space like "_"
+        else char_x += fonthor;
+    }
+    else char_x += fonthor; // fixed width
 }
 void GraphicsDisplay::Bitmap_BW(Bitmap_s bm, int x, int y)
 {