Revision 5:ba163fcbfbf1, committed 2015-12-16

Comitter:

Cognoscan

Date:

Wed Dec 16 18:43:48 2015 +0000

Parent:

4:256d9b541ab0

Commit message:

Updated to work with ST7735S (teal-colored tab)

Changed in this revision

diff -r 256d9b541ab0 -r ba163fcbfbf1 Adafruit_GFX.cpp
--- a/Adafruit_GFX.cpp	Thu Jul 30 05:20:08 2015 +0000
+++ b/Adafruit_GFX.cpp	Wed Dec 16 18:43:48 2015 +0000
@@ -444,7 +444,7 @@
    textbgcolor = b; 
  }
 
-void Adafruit_GFX::setTextWrap(boolean w) {
+void Adafruit_GFX::setTextWrap(bool w) {
   wrap = w;
 }
 
@@ -471,7 +471,7 @@
 }
 
 
-void Adafruit_GFX::invertDisplay(boolean i) {
+void Adafruit_GFX::invertDisplay(bool i) {
   // do nothing, can be subclassed
 }
 

diff -r 256d9b541ab0 -r ba163fcbfbf1 Adafruit_GFX.h
--- a/Adafruit_GFX.h	Thu Jul 30 05:20:08 2015 +0000
+++ b/Adafruit_GFX.h	Wed Dec 16 18:43:48 2015 +0000
@@ -37,9 +37,7 @@
 #include "mbed.h"
 #include "Stream.h"
 
-
 #define swap(a, b) { int16_t t = a; a = b; b = t; }
-#define boolean bool
 
 class Adafruit_GFX : public Stream
 {
@@ -51,7 +49,7 @@
     //void constructor(int16_t w, int16_t h);
 
     virtual void drawPixel(int16_t x, int16_t y, uint16_t color) = 0;
-    void invertDisplay(boolean i);
+    void invertDisplay(bool i);
 
     // these are 'generic' drawing functions, so we can share them!
     virtual void drawLine(int16_t x0, int16_t y0, int16_t x1, int16_t y1,uint16_t color);
@@ -81,7 +79,7 @@
     void setTextColor(uint16_t c);
     void setTextColor(uint16_t c, uint16_t bg);
     void setTextSize(uint8_t s);
-    void setTextWrap(boolean w);
+    void setTextWrap(bool w);
 
     int16_t height(void);
     int16_t width(void);
@@ -99,7 +97,7 @@
     uint16_t textcolor, textbgcolor;
     uint8_t  textsize;
     uint8_t  rotation;
-    boolean  wrap; // If set, 'wrap' text at right edge of display
+    bool  wrap; // If set, 'wrap' text at right edge of display
 };
 
 #endif

diff -r 256d9b541ab0 -r ba163fcbfbf1 glcdfont.h
--- a/glcdfont.h	Thu Jul 30 05:20:08 2015 +0000
+++ b/glcdfont.h	Wed Dec 16 18:43:48 2015 +0000
@@ -2,7 +2,7 @@
 #ifndef FONT5X7_H
 #define FONT5X7_H
 
-// standard ascii 5x7 font
+// standard ascii 5x7 font (5x8 characters + 1 pixel spacing)
 
 unsigned char  font[] = {
     0x00, 0x00, 0x00, 0x00, 0x00,