Revision 19:beff890cf659, committed 2015-07-27

Comitter:

eunkyoungkim

Date:

Mon Jul 27 01:58:00 2015 +0000

Parent:

18:3112550cc6a3

Commit message:

deleted Adafruit Logo

Changed in this revision

diff -r 3112550cc6a3 -r beff890cf659 Adafruit_GFX.h
--- a/Adafruit_GFX.h	Tue Jun 23 09:49:01 2015 +0000
+++ b/Adafruit_GFX.h	Mon Jul 27 01:58:00 2015 +0000
@@ -1,14 +1,14 @@
 /***********************************
-This is a our graphics core library, for all our displays. 
+This is a our graphics core library, for all our displays.
 We'll be adapting all the
-existing libaries to use this core to make updating, support 
+existing libaries to use this core to make updating, support
 and upgrading easier!
 
-Adafruit invests time and resources providing this open source code, 
-please support Adafruit and open-source hardware by purchasing 
+Adafruit invests time and resources providing this open source code,
+please support Adafruit and open-source hardware by purchasing
 products from Adafruit!
 
-Written by Limor Fried/Ladyada  for Adafruit Industries.  
+Written by Limor Fried/Ladyada  for Adafruit Industries.
 BSD license, check license.txt for more information
 All text above must be included in any redistribution
 ****************************************/
@@ -25,7 +25,7 @@
 static inline void swap(int16_t &a, int16_t &b)
 {
     int16_t t = a;
-    
+
     a = b;
     b = t;
 }
@@ -48,7 +48,7 @@
  */
 class Adafruit_GFX : public Stream
 {
- public:
+public:
     Adafruit_GFX(int16_t w, int16_t h)
         : _rawWidth(w)
         , _rawHeight(h)
@@ -61,22 +61,26 @@
         , textsize(1)
         , rotation(0)
         , wrap(true)
-        {};
+    {};
 
     /// Paint one BLACK or WHITE pixel in the display buffer
     // this must be defined by the subclass
     virtual void drawPixel(int16_t x, int16_t y, uint16_t color) = 0;
     // this is optional
     virtual void invertDisplay(bool i) {};
-    
+
     // Stream implementation - provides printf() interface
     // You would otherwise be forced to use writeChar()
-    virtual int _putc(int value) { return writeChar(value); };
-    virtual int _getc() { return -1; };
+    virtual int _putc(int value) {
+        return writeChar(value);
+    };
+    virtual int _getc() {
+        return -1;
+    };
 
 #ifdef GFX_WANT_ABSTRACTS
     // these are 'generic' drawing functions, so we can share them!
-    
+
     /** Draw a Horizontal Line
      * @note GFX_WANT_ABSTRACTS must be defined in Adafruit_GFX_config.h
      */
@@ -95,7 +99,7 @@
      */
     void drawCircle(int16_t x0, int16_t y0, int16_t r, uint16_t color);
     void drawCircleHelper(int16_t x0, int16_t y0, int16_t r, uint8_t cornername, uint16_t color);
-    
+
     /** Draw and fill a circle
      * @note GFX_WANT_ABSTRACTS must be defined in Adafruit_GFX_config.h
      */
@@ -110,7 +114,7 @@
      * @note GFX_WANT_ABSTRACTS must be defined in Adafruit_GFX_config.h
      */
     void fillTriangle(int16_t x0, int16_t y0, int16_t x1, int16_t y1, int16_t x2, int16_t y2, uint16_t color);
-    
+
     /** Draw a rounded rectangle
      * @note GFX_WANT_ABSTRACTS must be defined in Adafruit_GFX_config.h
      */
@@ -146,29 +150,49 @@
     size_t writeChar(uint8_t);
 
     /// Get the width of the display in pixels
-    inline int16_t width(void) { return _width; };
+    inline int16_t width(void) {
+        return _width;
+    };
     /// Get the height of the display in pixels
-    inline int16_t height(void) { return _height; };
+    inline int16_t height(void) {
+        return _height;
+    };
 
     /// Set the text cursor location, based on the size of the text
-    inline void setTextCursor(int16_t x, int16_t y) { cursor_x = x; cursor_y = y; };
+    inline void setTextCursor(int16_t x, int16_t y) {
+        cursor_x = x;
+        cursor_y = y;
+    };
 #if defined(GFX_WANT_ABSTRACTS) || defined(GFX_SIZEABLE_TEXT)
     /** Set the size of the text to be drawn
      * @note Make sure to enable either GFX_SIZEABLE_TEXT or GFX_WANT_ABSTRACTS
      */
-    inline void setTextSize(uint8_t s) { textsize = (s > 0) ? s : 1; };
+    inline void setTextSize(uint8_t s) {
+        textsize = (s > 0) ? s : 1;
+    };
 #endif
     /// Set the text foreground and background colors to be the same
-    inline void setTextColor(uint16_t c) { textcolor = c; textbgcolor = c; }
+    inline void setTextColor(uint16_t c) {
+        textcolor = c;
+        textbgcolor = c;
+    }
     /// Set the text foreground and background colors independantly
-    inline void setTextColor(uint16_t c, uint16_t b) { textcolor = c; textbgcolor = b; };
+    inline void setTextColor(uint16_t c, uint16_t b) {
+        textcolor = c;
+        textbgcolor = b;
+    };
     /// Set text wraping mode true or false
-    inline void setTextWrap(bool w) { wrap = w; };
+    inline void setTextWrap(bool w) {
+        wrap = w;
+    };
 
     /// Set the display rotation, 1, 2, 3, or 4
     void setRotation(uint8_t r);
     /// Get the current rotation
-    inline uint8_t getRotation(void) { rotation %= 4; return rotation; };
+    inline uint8_t getRotation(void) {
+        rotation %= 4;
+        return rotation;
+    };
 
 protected:
     int16_t  _rawWidth, _rawHeight;   // this is the 'raw' display w/h - never changes

diff -r 3112550cc6a3 -r beff890cf659 Adafruit_GFX_Config.h
--- a/Adafruit_GFX_Config.h	Tue Jun 23 09:49:01 2015 +0000
+++ b/Adafruit_GFX_Config.h	Mon Jul 27 01:58:00 2015 +0000
@@ -2,10 +2,10 @@
 #define _ADAFRUIT_GFX_CONFIG_H_
 
 // Uncomment this to turn off the builtin splash
-#define NO_SPLASH_ADAFRUIT
+//#define NO_SPLASH_ADAFRUIT
 
 // Uncomment this to enable all functionality
-//#define GFX_WANT_ABSTRACTS
+#define GFX_WANT_ABSTRACTS
 
 // Uncomment this to enable only runtime font scaling, without all the rest of the Abstracts
 //#define GFX_SIZEABLE_TEXT

diff -r 3112550cc6a3 -r beff890cf659 Adafruit_SSD1306.h
--- a/Adafruit_SSD1306.h	Tue Jun 23 09:49:01 2015 +0000
+++ b/Adafruit_SSD1306.h	Mon Jul 27 01:58:00 2015 +0000
@@ -72,6 +72,7 @@
 	void display();
 	/// Fill the buffer with the AdaFruit splash screen.
 	virtual void splash();
+	
     
 protected:
 	virtual void sendDisplayBuffer() = 0;
@@ -176,7 +177,7 @@
 	    , mi2cAddress(i2cAddress)
 	    {
 		    begin();
-		    splash();
+		  //  splash();
 		    display();
 	    };