Revision 19:e5d8d6e7fac5, committed 2019-02-25

Comitter:

gandhi4

Date:

Mon Feb 25 21:14:16 2019 +0000

Parent:

18:a267f00528be

Commit message:

a

Changed in this revision

diff -r a267f00528be -r e5d8d6e7fac5 Adafruit_GFX.cpp
--- a/Adafruit_GFX.cpp	Tue Feb 07 23:52:12 2017 +0000
+++ b/Adafruit_GFX.cpp	Mon Feb 25 21:14:16 2019 +0000
@@ -1,367 +1,8 @@
-/***********************************
-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 
-and upgrading easier!
-
-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.  
-BSD license, check license.txt for more information
-All text above must be included in any redistribution
-****************************************/
-
-/*
- *  Modified by Neal Horman 7/14/2012 for use in mbed
- */
-
 #include "mbed.h"
 
 #include "Adafruit_GFX.h"
 #include "glcdfont.h"
 
-#if defined(GFX_WANT_ABSTRACTS)
-// draw a circle outline
-void Adafruit_GFX::drawCircle(int16_t x0, int16_t y0, int16_t r, uint16_t color)
-{
-    int16_t f = 1 - r;
-    int16_t ddF_x = 1;
-    int16_t ddF_y = -2 * r;
-    int16_t x = 0;
-    int16_t y = r;
-    
-    drawPixel(x0, y0+r, color);
-    drawPixel(x0, y0-r, color);
-    drawPixel(x0+r, y0, color);
-    drawPixel(x0-r, y0, color);
-    
-    while (x<y)
-    {
-        if (f >= 0)
-        {
-            y--;
-            ddF_y += 2;
-            f += ddF_y;
-        }
-        x++;
-        ddF_x += 2;
-        f += ddF_x;
-        
-        drawPixel(x0 + x, y0 + y, color);
-        drawPixel(x0 - x, y0 + y, color);
-        drawPixel(x0 + x, y0 - y, color);
-        drawPixel(x0 - x, y0 - y, color);
-        drawPixel(x0 + y, y0 + x, color);
-        drawPixel(x0 - y, y0 + x, color);
-        drawPixel(x0 + y, y0 - x, color);
-        drawPixel(x0 - y, y0 - x, color);
-    }
-}
-
-void Adafruit_GFX::drawCircleHelper( int16_t x0, int16_t y0, int16_t r, uint8_t cornername, uint16_t color)
-{
-    int16_t f     = 1 - r;
-    int16_t ddF_x = 1;
-    int16_t ddF_y = -2 * r;
-    int16_t x     = 0;
-    int16_t y     = r;
-    
-    while (x<y)
-    {
-        if (f >= 0)
-        {
-            y--;
-            ddF_y += 2;
-            f += ddF_y;
-        }
-        x++;
-        ddF_x += 2;
-        f += ddF_x;
-        
-        if (cornername & 0x4)
-        {
-            drawPixel(x0 + x, y0 + y, color);
-            drawPixel(x0 + y, y0 + x, color);
-        } 
-
-        if (cornername & 0x2)
-        {
-            drawPixel(x0 + x, y0 - y, color);
-            drawPixel(x0 + y, y0 - x, color);
-        }
-
-        if (cornername & 0x8)
-        {
-            drawPixel(x0 - y, y0 + x, color);
-            drawPixel(x0 - x, y0 + y, color);
-        }
-        
-        if (cornername & 0x1)
-        {
-            drawPixel(x0 - y, y0 - x, color);
-            drawPixel(x0 - x, y0 - y, color);
-        }
-    }
-}
-
-void Adafruit_GFX::fillCircle(int16_t x0, int16_t y0, int16_t r, uint16_t color)
-{
-    drawFastVLine(x0, y0-r, 2*r+1, color);
-    fillCircleHelper(x0, y0, r, 3, 0, color);
-}
-
-// used to do circles and roundrects!
-void Adafruit_GFX::fillCircleHelper(int16_t x0, int16_t y0, int16_t r, uint8_t cornername, int16_t delta, uint16_t color)
-{
-    int16_t f     = 1 - r;
-    int16_t ddF_x = 1;
-    int16_t ddF_y = -2 * r;
-    int16_t x     = 0;
-    int16_t y     = r;
-    
-    while (x<y)
-    {
-        if (f >= 0)
-        {
-            y--;
-            ddF_y += 2;
-            f += ddF_y;
-        }
-        x++;
-        ddF_x += 2;
-        f += ddF_x;
-        
-        if (cornername & 0x1)
-        {
-            drawFastVLine(x0+x, y0-y, 2*y+1+delta, color);
-            drawFastVLine(x0+y, y0-x, 2*x+1+delta, color);
-        }
-
-        if (cornername & 0x2)
-        {
-            drawFastVLine(x0-x, y0-y, 2*y+1+delta, color);
-            drawFastVLine(x0-y, y0-x, 2*x+1+delta, color);
-        }
-    }
-}
-#endif
-
-#if defined(GFX_WANT_ABSTRACTS) || defined(GFX_SIZEABLE_TEXT)
-// bresenham's algorithm - thx wikpedia
-void Adafruit_GFX::drawLine(int16_t x0, int16_t y0,  int16_t x1, int16_t y1, uint16_t color)
-{
-    int16_t steep = abs(y1 - y0) > abs(x1 - x0);
-    
-    if (steep)
-    {
-        swap(x0, y0);
-        swap(x1, y1);
-    }
-    
-    if (x0 > x1)
-    {
-        swap(x0, x1);
-        swap(y0, y1);
-    }
-    
-    int16_t dx, dy;
-    dx = x1 - x0;
-    dy = abs(y1 - y0);
-    
-    int16_t err = dx / 2;
-    int16_t ystep;
-    
-    if (y0 < y1)
-        ystep = 1;
-    else
-        ystep = -1;
-    
-    for (; x0<=x1; x0++)
-    {
-        if (steep)
-            drawPixel(y0, x0, color);
-        else
-            drawPixel(x0, y0, color);
-
-        err -= dy;
-        if (err < 0)
-        {
-            y0 += ystep;
-            err += dx;
-        }
-    }
-}
-
-void Adafruit_GFX::drawFastVLine(int16_t x, int16_t y, int16_t h, uint16_t color)
-{
-    // stupidest version - update in subclasses if desired!
-    drawLine(x, y, x, y+h-1, color);
-}
-
-void Adafruit_GFX::fillRect(int16_t x, int16_t y, int16_t w, int16_t h, uint16_t color)
-{
-    // stupidest version - update in subclasses if desired!
-    for (int16_t i=x; i<x+w; i++)
-        drawFastVLine(i, y, h, color); 
-}
-#endif
-
-#if defined(GFX_WANT_ABSTRACTS)
-// draw a rectangle
-void Adafruit_GFX::drawRect(int16_t x, int16_t y, int16_t w, int16_t h, uint16_t color)
-{
-    drawFastHLine(x, y, w, color);
-    drawFastHLine(x, y+h-1, w, color);
-    drawFastVLine(x, y, h, color);
-    drawFastVLine(x+w-1, y, h, color);
-}
-
-void Adafruit_GFX::drawFastHLine(int16_t x, int16_t y, int16_t w, uint16_t color)
-{
-    // stupidest version - update in subclasses if desired!
-    drawLine(x, y, x+w-1, y, color);
-}
-
-void Adafruit_GFX::fillScreen(uint16_t color)
-{
-    fillRect(0, 0, _width, _height, color);
-}
-
-// draw a rounded rectangle!
-void Adafruit_GFX::drawRoundRect(int16_t x, int16_t y, int16_t w, int16_t h, int16_t r, uint16_t color)
-{
-    // smarter version
-    drawFastHLine(x+r  , y    , w-2*r, color); // Top
-    drawFastHLine(x+r  , y+h-1, w-2*r, color); // Bottom
-    drawFastVLine(  x    , y+r  , h-2*r, color); // Left
-    drawFastVLine(  x+w-1, y+r  , h-2*r, color); // Right
-    // draw four corners
-    drawCircleHelper(x+r    , y+r    , r, 1, color);
-    drawCircleHelper(x+w-r-1, y+r    , r, 2, color);
-    drawCircleHelper(x+w-r-1, y+h-r-1, r, 4, color);
-    drawCircleHelper(x+r    , y+h-r-1, r, 8, color);
-}
-
-// fill a rounded rectangle!
-void Adafruit_GFX::fillRoundRect(int16_t x, int16_t y, int16_t w, int16_t h, int16_t r, uint16_t color)
-{
-    // smarter version
-    fillRect(x+r, y, w-2*r, h, color);
-    
-    // draw four corners
-    fillCircleHelper(x+w-r-1, y+r, r, 1, h-2*r-1, color);
-    fillCircleHelper(x+r    , y+r, r, 2, h-2*r-1, color);
-}
-
-// draw a triangle!
-void Adafruit_GFX::drawTriangle(int16_t x0, int16_t y0, int16_t x1, int16_t y1, int16_t x2, int16_t y2, uint16_t color)
-{
-    drawLine(x0, y0, x1, y1, color);
-    drawLine(x1, y1, x2, y2, color);
-    drawLine(x2, y2, x0, y0, color);
-}
-
-// fill a triangle!
-void Adafruit_GFX::fillTriangle ( int16_t x0, int16_t y0, int16_t x1, int16_t y1, int16_t x2, int16_t y2, uint16_t color)
-{
-    int16_t a, b, y, last;
-    
-    // Sort coordinates by Y order (y2 >= y1 >= y0)
-    if (y0 > y1)
-        swap(y0, y1); swap(x0, x1);
-
-    if (y1 > y2)
-        swap(y2, y1); swap(x2, x1);
-
-    if (y0 > y1)
-        swap(y0, y1); swap(x0, x1);
-
-    
-    if(y0 == y2)
-    { // Handle awkward all-on-same-line case as its own thing
-        a = b = x0;
-        if(x1 < a)
-            a = x1;
-        else if(x1 > b)
-            b = x1;
-            
-        if(x2 < a)
-            a = x2;
-        else if(x2 > b) b = x2;
-            drawFastHLine(a, y0, b-a+1, color);
-        return;
-    }
-
-    int16_t
-        dx01 = x1 - x0,
-        dy01 = y1 - y0,
-        dx02 = x2 - x0,
-        dy02 = y2 - y0,
-        dx12 = x2 - x1,
-        dy12 = y2 - y1,
-        sa   = 0,
-        sb   = 0;
-
-    // For upper part of triangle, find scanline crossings for segments
-    // 0-1 and 0-2.  If y1=y2 (flat-bottomed triangle), the scanline y1
-    // is included here (and second loop will be skipped, avoiding a /0
-    // error there), otherwise scanline y1 is skipped here and handled
-    // in the second loop...which also avoids a /0 error here if y0=y1
-    // (flat-topped triangle).
-    if(y1 == y2)
-        last = y1;   // Include y1 scanline
-    else
-        last = y1-1; // Skip it
-
-    for(y=y0; y<=last; y++)
-    {
-        a   = x0 + sa / dy01;
-        b   = x0 + sb / dy02;
-        sa += dx01;
-        sb += dx02;
-        /* longhand:
-        a = x0 + (x1 - x0) * (y - y0) / (y1 - y0);
-        b = x0 + (x2 - x0) * (y - y0) / (y2 - y0);
-        */
-        if(a > b)
-            swap(a,b);
-        drawFastHLine(a, y, b-a+1, color);
-    }
-
-    // For lower part of triangle, find scanline crossings for segments
-    // 0-2 and 1-2.  This loop is skipped if y1=y2.
-    sa = dx12 * (y - y1);
-    sb = dx02 * (y - y0);
-    for(; y<=y2; y++)
-    {
-        a   = x1 + sa / dy12;
-        b   = x0 + sb / dy02;
-        sa += dx12;
-        sb += dx02;
-        /* longhand:
-        a = x1 + (x2 - x1) * (y - y1) / (y2 - y1);
-        b = x0 + (x2 - x0) * (y - y0) / (y2 - y0);
-        */
-        if(a > b)
-            swap(a,b);
-        drawFastHLine(a, y, b-a+1, color);
-    }
-}
-
-void Adafruit_GFX::drawBitmap(int16_t x, int16_t y, const uint8_t *bitmap, int16_t w, int16_t h, uint16_t color)
-{
-    for (int16_t j=0; j<h; j++)
-    {
-        for (int16_t i=0; i<w; i++ )
-        {
-            if (bitmap[i + (j/8)*w] & _BV(j%8))
-                drawPixel(x+i, y+j, color);
-        }
-    }
-}
-#endif
 
 size_t Adafruit_GFX::writeChar(uint8_t c)
 {
@@ -432,23 +73,4 @@
             line >>= 1;
         }
     }
-}
-
-void Adafruit_GFX::setRotation(uint8_t x)
-{
-    x %= 4;  // cant be higher than 3
-    rotation = x;
-    switch (x)
-    {
-        case 0:
-        case 2:
-            _width = _rawWidth;
-            _height = _rawHeight;
-            break;
-        case 1:
-        case 3:
-            _width = _rawHeight;
-            _height = _rawWidth;
-            break;
-    }
-}
+}
\ No newline at end of file

diff -r a267f00528be -r e5d8d6e7fac5 Adafruit_GFX.h
--- a/Adafruit_GFX.h	Tue Feb 07 23:52:12 2017 +0000
+++ b/Adafruit_GFX.h	Mon Feb 25 21:14:16 2019 +0000
@@ -1,27 +1,6 @@
-/***********************************
-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 
-and upgrading easier!
-
-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.  
-BSD license, check license.txt for more information
-All text above must be included in any redistribution
-****************************************/
-
-/*
- *  Modified by Neal Horman 7/14/2012 for use in mbed
- */
-
 #ifndef _ADAFRUIT_GFX_H_
 #define _ADAFRUIT_GFX_H_
 
-#include "Adafruit_GFX_Config.h"
-
 static inline void swap(int16_t &a, int16_t &b)
 {
     int16_t t = a;
@@ -37,15 +16,6 @@
 #define BLACK 0
 #define WHITE 1
 
-/**
- * This is a Text and Graphics element drawing class.
- * These functions draw to the display buffer.
- *
- * Display drivers should be derived from here.
- * The Display drivers push the display buffer to the
- * hardware based on application control.
- *
- */
 class Adafruit_GFX : public Stream
 {
  public:
@@ -74,71 +44,8 @@
     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
-     */
-    virtual void drawFastHLine(int16_t x, int16_t y, int16_t w, uint16_t color);
-    /** Draw a rectangle
-     * @note GFX_WANT_ABSTRACTS must be defined in Adafruit_GFX_config.h
-     */
-    virtual void drawRect(int16_t x, int16_t y, int16_t w, int16_t h, uint16_t color);
-    /** Fill the entire display
-     * @note GFX_WANT_ABSTRACTS must be defined in Adafruit_GFX_config.h
-     */
-    virtual void fillScreen(uint16_t color);
-
-    /** Draw a circle
-     * @note GFX_WANT_ABSTRACTS must be defined in Adafruit_GFX_config.h
-     */
-    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
-     */
-    void fillCircle(int16_t x0, int16_t y0, int16_t r, uint16_t color);
-    void fillCircleHelper(int16_t x0, int16_t y0, int16_t r, uint8_t cornername, int16_t delta, uint16_t color);
 
-    /** Draw a triangle
-     * @note GFX_WANT_ABSTRACTS must be defined in Adafruit_GFX_config.h
-     */
-    void drawTriangle(int16_t x0, int16_t y0, int16_t x1, int16_t y1, int16_t x2, int16_t y2, uint16_t color);
-    /** Draw and fill a triangle
-     * @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
-     */
-    void drawRoundRect(int16_t x0, int16_t y0, int16_t w, int16_t h, int16_t radius, uint16_t color);
-    /** Draw and fill a rounded rectangle
-     * @note GFX_WANT_ABSTRACTS must be defined in Adafruit_GFX_config.h
-     */
-    void fillRoundRect(int16_t x0, int16_t y0, int16_t w, int16_t h, int16_t radius, uint16_t color);
-    /** Draw a bitmap
-     * @note GFX_WANT_ABSTRACTS must be defined in Adafruit_GFX_config.h
-     */
-    void drawBitmap(int16_t x, int16_t y, const uint8_t *bitmap, int16_t w, int16_t h, uint16_t color);
-#endif
 
-#if defined(GFX_WANT_ABSTRACTS) || defined(GFX_SIZEABLE_TEXT)
-    /** Draw a line
-     * @note GFX_WANT_ABSTRACTS or GFX_SIZEABLE_TEXT must be defined in Adafruit_GFX_config.h
-     */
-    virtual void drawLine(int16_t x0, int16_t y0, int16_t x1, int16_t y1, uint16_t color);
-    /** Draw a vertical line
-     * @note GFX_WANT_ABSTRACTS or GFX_SIZEABLE_TEXT must be defined in Adafruit_GFX_config.h
-     */
-    virtual void drawFastVLine(int16_t x, int16_t y, int16_t h, uint16_t color);
-    /** Draw and fill a rectangle
-     * @note GFX_WANT_ABSTRACTS or GFX_SIZEABLE_TEXT must be defined in Adafruit_GFX_config.h
-     */
-    virtual void fillRect(int16_t x, int16_t y, int16_t w, int16_t h, uint16_t color);
-#endif
 
     /// Draw a text character at a specified pixel location
     void drawChar(int16_t x, int16_t y, unsigned char c, uint16_t color, uint16_t bg, uint8_t size);
@@ -165,10 +72,6 @@
     /// Set text wraping mode true or false
     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; };
 
 protected:
     int16_t  _rawWidth, _rawHeight;   // this is the 'raw' display w/h - never changes

diff -r a267f00528be -r e5d8d6e7fac5 Adafruit_GFX_Config.h
--- a/Adafruit_GFX_Config.h	Tue Feb 07 23:52:12 2017 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-#ifndef _ADAFRUIT_GFX_CONFIG_H_
-#define _ADAFRUIT_GFX_CONFIG_H_
-
-// Uncomment this to turn off the builtin splash
-//#define NO_SPLASH_ADAFRUIT
-
-// Uncomment this to enable all functionality
-//#define GFX_WANT_ABSTRACTS
-
-// Uncomment this to enable only runtime font scaling, without all the rest of the Abstracts
-//#define GFX_SIZEABLE_TEXT
-
-
-#endif
\ No newline at end of file

diff -r a267f00528be -r e5d8d6e7fac5 Adafruit_SSD1306.cpp
--- a/Adafruit_SSD1306.cpp	Tue Feb 07 23:52:12 2017 +0000
+++ b/Adafruit_SSD1306.cpp	Mon Feb 25 21:14:16 2019 +0000
@@ -1,25 +1,3 @@
-/*********************************************************************
-This is a library for our Monochrome OLEDs based on SSD1306 drivers
-
-  Pick one up today in the adafruit shop!
-  ------> http://www.adafruit.com/category/63_98
-
-These displays use SPI to communicate, 4 or 5 pins are required to  
-interface
-
-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.  
-BSD license, check license.txt for more information
-All text above, and the splash screen below must be included in any redistribution
-*********************************************************************/
-
-/*
- *  Modified by Neal Horman 7/14/2012 for use in mbed
- */
-
 #include "mbed.h"
 #include "Adafruit_SSD1306.h"
 
@@ -95,22 +73,7 @@
     if ((x < 0) || (x >= width()) || (y < 0) || (y >= height()))
         return;
     
-    // check rotation, move pixel around if necessary
-    switch (getRotation())
-    {
-        case 1:
-            swap(x, y);
-            x = _rawWidth - x - 1;
-            break;
-        case 2:
-            x = _rawWidth - x - 1;
-            y = _rawHeight - y - 1;
-            break;
-        case 3:
-            swap(x, y);
-            y = _rawHeight - y - 1;
-            break;
-    }  
+    
     
     // x is which column
     if (color == WHITE) 
@@ -139,82 +102,4 @@
 	std::fill(buffer.begin(),buffer.end(),0);
 }
 
-void Adafruit_SSD1306::splash(void)
-{
-#ifndef NO_SPLASH_ADAFRUIT
-	uint8_t adaFruitLogo[64 * 128 / 8] =
-	{ 
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80,
-		0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-		0x00, 0x80, 0x80, 0xC0, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-		0x00, 0x00, 0x00, 0x00, 0x80, 0xC0, 0xE0, 0xF0, 0xF8, 0xFC, 0xF8, 0xE0, 0x00, 0x00, 0x00, 0x00,
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80,
-		0x80, 0x80, 0x00, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x80, 0x00, 0xFF,
-		0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00,
-		0x80, 0xFF, 0xFF, 0x80, 0x80, 0x00, 0x80, 0x80, 0x00, 0x80, 0x80, 0x80, 0x80, 0x00, 0x80, 0x80,
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00, 0x8C, 0x8E, 0x84, 0x00, 0x00, 0x80, 0xF8,
-		0xF8, 0xF8, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-		0xF0, 0xF0, 0xF0, 0xF0, 0xF0, 0xF0, 0xF0, 0xF0, 0xF0, 0xF0, 0xF0, 0xF0, 0xE0, 0xE0, 0xC0, 0x80,
-		0x00, 0xE0, 0xFC, 0xFE, 0xFF, 0xFF, 0xFF, 0x7F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00,
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFE, 0xFF, 0xC7, 0x01, 0x01,
-		0x01, 0x01, 0x83, 0xFF, 0xFF, 0x00, 0x00, 0x7C, 0xFE, 0xC7, 0x01, 0x01, 0x01, 0x01, 0x83, 0xFF,
-		0xFF, 0xFF, 0x00, 0x38, 0xFE, 0xC7, 0x83, 0x01, 0x01, 0x01, 0x83, 0xC7, 0xFF, 0xFF, 0x00, 0x00,
-		0x01, 0xFF, 0xFF, 0x01, 0x01, 0x00, 0xFF, 0xFF, 0x07, 0x01, 0x01, 0x01, 0x00, 0x00, 0x7F, 0xFF,
-		0x80, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x7F, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x01, 0xFF,
-		0xFF, 0xFF, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-		0x03, 0x0F, 0x3F, 0x7F, 0x7F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xE7, 0xC7, 0xC7, 0x8F,
-		0x8F, 0x9F, 0xBF, 0xFF, 0xFF, 0xC3, 0xC0, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFC, 0xFC, 0xFC,
-		0xFC, 0xFC, 0xFC, 0xFC, 0xFC, 0xF8, 0xF8, 0xF0, 0xF0, 0xE0, 0xC0, 0x00, 0x01, 0x03, 0x03, 0x03,
-		0x03, 0x03, 0x01, 0x03, 0x03, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03, 0x03, 0x03, 0x03, 0x01, 0x01,
-		0x03, 0x01, 0x00, 0x00, 0x00, 0x01, 0x03, 0x03, 0x03, 0x03, 0x01, 0x01, 0x03, 0x03, 0x00, 0x00,
-		0x00, 0x03, 0x03, 0x00, 0x00, 0x00, 0x03, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
-		0x03, 0x03, 0x03, 0x03, 0x03, 0x01, 0x00, 0x00, 0x00, 0x01, 0x03, 0x01, 0x00, 0x00, 0x00, 0x03,
-		0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-		// 128x32^^^  128x64vvv
-		0x00, 0x00, 0x00, 0x80, 0xC0, 0xE0, 0xF0, 0xF9, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x3F, 0x1F, 0x0F,
-		0x87, 0xC7, 0xF7, 0xFF, 0xFF, 0x1F, 0x1F, 0x3D, 0xFC, 0xF8, 0xF8, 0xF8, 0xF8, 0x7C, 0x7D, 0xFF,
-		0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x7F, 0x3F, 0x0F, 0x07, 0x00, 0x30, 0x30, 0x00, 0x00,
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-		0x00, 0x00, 0x00, 0x00, 0xFE, 0xFE, 0xFC, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xE0, 0xC0, 0x00,
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x30, 0x00, 0x00, 0x00, 0x00,
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-		0x00, 0xC0, 0xFE, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x7F, 0x7F, 0x3F, 0x1F,
-		0x0F, 0x07, 0x1F, 0x7F, 0xFF, 0xFF, 0xF8, 0xF8, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFE, 0xF8, 0xE0,
-		0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFE, 0xFE, 0x00, 0x00,
-		0x00, 0xFC, 0xFE, 0xFC, 0x0C, 0x06, 0x06, 0x0E, 0xFC, 0xF8, 0x00, 0x00, 0xF0, 0xF8, 0x1C, 0x0E,
-		0x06, 0x06, 0x06, 0x0C, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0xFE, 0xFE, 0x00, 0x00, 0x00, 0x00, 0xFC,
-		0xFE, 0xFC, 0x00, 0x18, 0x3C, 0x7E, 0x66, 0xE6, 0xCE, 0x84, 0x00, 0x00, 0x06, 0xFF, 0xFF, 0x06,
-		0x06, 0xFC, 0xFE, 0xFC, 0x0C, 0x06, 0x06, 0x06, 0x00, 0x00, 0xFE, 0xFE, 0x00, 0x00, 0xC0, 0xF8,
-		0xFC, 0x4E, 0x46, 0x46, 0x46, 0x4E, 0x7C, 0x78, 0x40, 0x18, 0x3C, 0x76, 0xE6, 0xCE, 0xCC, 0x80,
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-		0x00, 0x00, 0x00, 0x00, 0x01, 0x07, 0x0F, 0x1F, 0x1F, 0x3F, 0x3F, 0x3F, 0x3F, 0x1F, 0x0F, 0x03,
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0F, 0x0F, 0x00, 0x00,
-		0x00, 0x0F, 0x0F, 0x0F, 0x00, 0x00, 0x00, 0x00, 0x0F, 0x0F, 0x00, 0x00, 0x03, 0x07, 0x0E, 0x0C,
-		0x18, 0x18, 0x0C, 0x06, 0x0F, 0x0F, 0x0F, 0x00, 0x00, 0x01, 0x0F, 0x0E, 0x0C, 0x18, 0x0C, 0x0F,
-		0x07, 0x01, 0x00, 0x04, 0x0E, 0x0C, 0x18, 0x0C, 0x0F, 0x07, 0x00, 0x00, 0x00, 0x0F, 0x0F, 0x00,
-		0x00, 0x0F, 0x0F, 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0F, 0x0F, 0x00, 0x00, 0x00, 0x07,
-		0x07, 0x0C, 0x0C, 0x18, 0x1C, 0x0C, 0x06, 0x06, 0x00, 0x04, 0x0E, 0x0C, 0x18, 0x0C, 0x0F, 0x07,
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-	};
 	
-	std::copy(
-		&adaFruitLogo[0]
-		, &adaFruitLogo[0] + (_rawHeight == 32 ? sizeof(adaFruitLogo)/2 : sizeof(adaFruitLogo))
-		, buffer.begin()
-		);
-#endif
-}

diff -r a267f00528be -r e5d8d6e7fac5 Adafruit_SSD1306.h
--- a/Adafruit_SSD1306.h	Tue Feb 07 23:52:12 2017 +0000
+++ b/Adafruit_SSD1306.h	Mon Feb 25 21:14:16 2019 +0000
@@ -1,26 +1,3 @@
-/*********************************************************************
-This is a library for our Monochrome OLEDs based on SSD1306 drivers
-
-  Pick one up today in the adafruit shop!
-  ------> http://www.adafruit.com/category/63_98
-
-These displays use SPI to communicate, 4 or 5 pins are required to  
-interface
-
-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.  
-BSD license, check license.txt for more information
-All text above, and the splash screen must be included in any redistribution
-*********************************************************************/
-
-/*
- *  Modified by Neal Horman 7/14/2012 for use in mbed
- *  Modified by Greg Steiert 2/7/2017 for FeatherOLED
- */
-
 #ifndef _ADAFRUIT_SSD1306_H_
 #define _ADAFRUIT_SSD1306_H_
 
@@ -33,11 +10,6 @@
 #define SSD1306_EXTERNALVCC 0x1
 #define SSD1306_SWITCHCAPVCC 0x2
 
-/** The pure base class for the SSD1306 display driver.
- *
- * You should derive from this for a new transport interface type,
- * such as the SPI and I2C drivers.
- */
 class Adafruit_SSD1306 : public Adafruit_GFX
 {
 public:
@@ -60,8 +32,6 @@
 
 	/// Cause the display to be updated with the buffer content.
 	void display();
-	/// Fill the buffer with the AdaFruit splash screen.
-	virtual void splash();
     
 protected:
 	virtual void sendDisplayBuffer() = 0;
@@ -71,9 +41,8 @@
 };
 
 
-/** This is the I2C SSD1306 display driver transport class
- *
- */
+// This is the I2C SSD1306 display driver transport class
+
 class Adafruit_SSD1306_I2c : public Adafruit_SSD1306
 {
 public:
@@ -95,7 +64,6 @@
 	    , mi2cAddress(i2cAddress)
 	    {
 		    begin();
-		    splash();
 		    display();
 	    };
 

diff -r a267f00528be -r e5d8d6e7fac5 license.txt
--- a/license.txt	Tue Feb 07 23:52:12 2017 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-Software License Agreement (BSD License)
-
-Copyright (c) 2012 Adafruit Industries.  All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-- Redistributions of source code must retain the above copyright notice,
-  this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright notice,
-  this list of conditions and the following disclaimer in the documentation
-  and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.