From d4bea375fed5d318a76064ad41c4e6909fa9c740 Mon Sep 17 00:00:00 2001
From: Mike Causer <mcauser@gmail.com>
Date: Wed, 6 Apr 2016 23:36:25 +1000
Subject: [PATCH 1/9] Add support for 64x48 OLED

I2C connections for ESP8266:
SCL = GPIO5
SDA = GPIO4
RST = GPIO0
---
 Adafruit_SSD1306.cpp                          |  40 +-
 Adafruit_SSD1306.h                            |   7 +-
 .../ssd1306_64x48_i2c/ssd1306_64x48_i2c.ino   | 415 ++++++++++++++++++
 splash.h                                      |  22 +
 4 files changed, 475 insertions(+), 9 deletions(-)
 create mode 100644 examples/ssd1306_64x48_i2c/ssd1306_64x48_i2c.ino

diff --git a/Adafruit_SSD1306.cpp b/Adafruit_SSD1306.cpp
index 0ab81a4c..1955c591 100644
--- a/Adafruit_SSD1306.cpp
+++ b/Adafruit_SSD1306.cpp
@@ -467,12 +467,15 @@ bool Adafruit_SSD1306::begin(uint8_t vcs, uint8_t addr, bool reset,
     return false;
 
   clearDisplay();
-  if (HEIGHT > 32) {
+  if (WIDTH > 64 && HEIGHT > 32) {
     drawBitmap((WIDTH - splash1_width) / 2, (HEIGHT - splash1_height) / 2,
                splash1_data, splash1_width, splash1_height, 1);
-  } else {
+  } else if(WIDTH > 64) {
     drawBitmap((WIDTH - splash2_width) / 2, (HEIGHT - splash2_height) / 2,
                splash2_data, splash2_width, splash2_height, 1);
+  } else {
+    drawBitmap((WIDTH - splash3_width) / 2, (HEIGHT - splash3_height) / 2,
+      splash3_data, splash3_width, splash3_height, 1);
   }
 
   vccstate = vcs;
@@ -563,6 +566,13 @@ bool Adafruit_SSD1306::begin(uint8_t vcs, uint8_t addr, bool reset,
   } else if ((WIDTH == 96) && (HEIGHT == 16)) {
     comPins = 0x2; // ada x12
     contrast = (vccstate == SSD1306_EXTERNALVCC) ? 0x10 : 0xAF;
+  } else if ((WIDTH == 64) && (HEIGHT == 48)) {
+    static const uint8_t PROGMEM init4d[] = {
+      SSD1306_SETCOMPINS,                 // 0xDA
+      0x12,
+      SSD1306_SETCONTRAST };              // 0x81
+    ssd1306_commandList(init4d, sizeof(init4d));
+    ssd1306_command1((vccstate == SSD1306_EXTERNALVCC) ? 0x9F : 0xCF);
   } else {
     // Other screen varieties -- TBD
   }
@@ -925,13 +935,27 @@ uint8_t *Adafruit_SSD1306::getBuffer(void) { return buffer; }
 */
 void Adafruit_SSD1306::display(void) {
   TRANSACTION_START
-  static const uint8_t PROGMEM dlist1[] = {
+  if ((WIDTH != 64) || (HEIGHT != 48)) {
+    static const uint8_t PROGMEM dlist1a[] = {
       SSD1306_PAGEADDR,
-      0,                      // Page start address
-      0xFF,                   // Page end (not really, but works here)
-      SSD1306_COLUMNADDR, 0}; // Column start address
-  ssd1306_commandList(dlist1, sizeof(dlist1));
-  ssd1306_command1(WIDTH - 1); // Column end address
+      0,                         // Page start address
+      0xFF,                      // Page end (not really, but works here)
+      SSD1306_COLUMNADDR,
+      0 };                       // Column start address
+    ssd1306_commandList(dlist1a, sizeof(dlist1a));
+    ssd1306_command1(WIDTH - 1); // Column end address
+  } else {
+    static const uint8_t PROGMEM dlist1b[] = {
+      SSD1306_PAGEADDR,
+      0 };                       // Page start address
+    ssd1306_commandList(dlist1b, sizeof(dlist1b));
+    ssd1306_command1((HEIGHT / 8) - 1); // Page end address
+    static const uint8_t PROGMEM dlist2b[] = {
+      SSD1306_COLUMNADDR,
+      32 };                       // Column start address
+    ssd1306_commandList(dlist2b, sizeof(dlist2b));
+    ssd1306_command1(32 + WIDTH - 1); // Column end address
+  }
 
 #if defined(ESP8266)
   // ESP8266 needs a periodic yield() call to avoid watchdog reset.
diff --git a/Adafruit_SSD1306.h b/Adafruit_SSD1306.h
index 5100c015..bba75c0f 100644
--- a/Adafruit_SSD1306.h
+++ b/Adafruit_SSD1306.h
@@ -24,10 +24,11 @@
 #ifndef _Adafruit_SSD1306_H_
 #define _Adafruit_SSD1306_H_
 
-// ONE of the following three lines must be #defined:
+// ONE of the following four lines must be #defined:
 //#define SSD1306_128_64 ///< DEPRECTAED: old way to specify 128x64 screen
 #define SSD1306_128_32 ///< DEPRECATED: old way to specify 128x32 screen
 //#define SSD1306_96_16  ///< DEPRECATED: old way to specify 96x16 screen
+//#define SSD1306_64_48  ///< DEPRECATED: old way to specify 64x48 screen
 // This establishes the screen dimensions in old Adafruit_SSD1306 sketches
 // (NEW CODE SHOULD IGNORE THIS, USE THE CONSTRUCTORS THAT ACCEPT WIDTH
 // AND HEIGHT ARGUMENTS).
@@ -118,6 +119,10 @@ typedef uint32_t PortMask;
 #define SSD1306_LCDWIDTH 96  ///< DEPRECATED: width w/SSD1306_96_16 defined
 #define SSD1306_LCDHEIGHT 16 ///< DEPRECATED: height w/SSD1306_96_16 defined
 #endif
+#if defined SSD1306_64_48
+ #define SSD1306_LCDWIDTH   64 ///< DEPRECATED: width w/SSD1306_64_48 defined
+ #define SSD1306_LCDHEIGHT  48 ///< DEPRECATED: height w/SSD1306_64_48 defined
+#endif
 
 /*!
     @brief  Class that stores state and functions for interacting with
diff --git a/examples/ssd1306_64x48_i2c/ssd1306_64x48_i2c.ino b/examples/ssd1306_64x48_i2c/ssd1306_64x48_i2c.ino
new file mode 100644
index 00000000..cc4e7317
--- /dev/null
+++ b/examples/ssd1306_64x48_i2c/ssd1306_64x48_i2c.ino
@@ -0,0 +1,415 @@
+/**************************************************************************
+ This is an example for our Monochrome OLEDs based on SSD1306 drivers
+
+ Pick one up today in the adafruit shop!
+ ------> http://www.adafruit.com/category/63_98
+
+ This example is for a 64x48 pixel display using I2C to communicate
+ 3 pins are required to interface (two I2C and one reset).
+
+ 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,
+ with contributions from the open source community.
+ BSD license, check license.txt for more information
+ All text above, and the splash screen below must be
+ included in any redistribution.
+ **************************************************************************/
+
+#include <SPI.h>
+#include <Wire.h>
+#include <Adafruit_GFX.h>
+#include <Adafruit_SSD1306.h>
+
+#define SCREEN_WIDTH 64 // OLED display width, in pixels
+#define SCREEN_HEIGHT 48 // OLED display height, in pixels
+
+// Declaration for an SSD1306 display connected to I2C (SDA, SCL pins)
+// The pins for I2C are defined by the Wire-library. 
+// On an arduino UNO:       A4(SDA), A5(SCL)
+// On an arduino MEGA 2560: 20(SDA), 21(SCL)
+// On an arduino LEONARDO:   2(SDA),  3(SCL), ...
+#define OLED_RESET     0 // GPIO0 - Reset pin # (or -1 if sharing Arduino reset pin)
+#define SCREEN_ADDRESS 0x3C ///< See datasheet for Address; 0x3D for 128x64, 0x3C for 128x32, 0x3C for 64x48
+Adafruit_SSD1306 display(SCREEN_WIDTH, SCREEN_HEIGHT, &Wire, OLED_RESET);
+
+#define NUMFLAKES     10 // Number of snowflakes in the animation example
+
+#define LOGO_HEIGHT   16
+#define LOGO_WIDTH    16
+static const unsigned char PROGMEM logo_bmp[] =
+{ B00000000, B11000000,
+  B00000001, B11000000,
+  B00000001, B11000000,
+  B00000011, B11100000,
+  B11110011, B11100000,
+  B11111110, B11111000,
+  B01111110, B11111111,
+  B00110011, B10011111,
+  B00011111, B11111100,
+  B00001101, B01110000,
+  B00011011, B10100000,
+  B00111111, B11100000,
+  B00111111, B11110000,
+  B01111100, B11110000,
+  B01110000, B01110000,
+  B00000000, B00110000 };
+
+void setup() {
+  Serial.begin(9600);
+
+  // SSD1306_SWITCHCAPVCC = generate display voltage from 3.3V internally
+  if(!display.begin(SSD1306_SWITCHCAPVCC, SCREEN_ADDRESS)) {
+    Serial.println(F("SSD1306 allocation failed"));
+    for(;;); // Don't proceed, loop forever
+  }
+
+  // Show initial display buffer contents on the screen --
+  // the library initializes this with an Adafruit splash screen.
+  display.display();
+  delay(2000); // Pause for 2 seconds
+
+  // Clear the buffer
+  display.clearDisplay();
+
+  // Draw a single pixel in white
+  display.drawPixel(10, 10, SSD1306_WHITE);
+
+  // Show the display buffer on the screen. You MUST call display() after
+  // drawing commands to make them visible on screen!
+  display.display();
+  delay(2000);
+  // display.display() is NOT necessary after every single drawing command,
+  // unless that's what you want...rather, you can batch up a bunch of
+  // drawing operations and then update the screen all at once by calling
+  // display.display(). These examples demonstrate both approaches...
+
+  testdrawline();      // Draw many lines
+
+  testdrawrect();      // Draw rectangles (outlines)
+
+  testfillrect();      // Draw rectangles (filled)
+
+  testdrawcircle();    // Draw circles (outlines)
+
+  testfillcircle();    // Draw circles (filled)
+
+  testdrawroundrect(); // Draw rounded rectangles (outlines)
+
+  testfillroundrect(); // Draw rounded rectangles (filled)
+
+  testdrawtriangle();  // Draw triangles (outlines)
+
+  testfilltriangle();  // Draw triangles (filled)
+
+  testdrawchar();      // Draw characters of the default font
+
+  testdrawstyles();    // Draw 'stylized' characters
+
+  testscrolltext();    // Draw scrolling text
+
+  testdrawbitmap();    // Draw a small bitmap image
+
+  // Invert and restore display, pausing in-between
+  display.invertDisplay(true);
+  delay(1000);
+  display.invertDisplay(false);
+  delay(1000);
+
+  testanimate(logo_bmp, LOGO_WIDTH, LOGO_HEIGHT); // Animate bitmaps
+}
+
+void loop() {
+}
+
+void testdrawline() {
+  int16_t i;
+
+  display.clearDisplay(); // Clear display buffer
+
+  for(i=0; i<display.width(); i+=4) {
+    display.drawLine(0, 0, i, display.height()-1, SSD1306_WHITE);
+    display.display(); // Update screen with each newly-drawn line
+    delay(1);
+  }
+  for(i=0; i<display.height(); i+=4) {
+    display.drawLine(0, 0, display.width()-1, i, SSD1306_WHITE);
+    display.display();
+    delay(1);
+  }
+  delay(250);
+
+  display.clearDisplay();
+
+  for(i=0; i<display.width(); i+=4) {
+    display.drawLine(0, display.height()-1, i, 0, SSD1306_WHITE);
+    display.display();
+    delay(1);
+  }
+  for(i=display.height()-1; i>=0; i-=4) {
+    display.drawLine(0, display.height()-1, display.width()-1, i, SSD1306_WHITE);
+    display.display();
+    delay(1);
+  }
+  delay(250);
+
+  display.clearDisplay();
+
+  for(i=display.width()-1; i>=0; i-=4) {
+    display.drawLine(display.width()-1, display.height()-1, i, 0, SSD1306_WHITE);
+    display.display();
+    delay(1);
+  }
+  for(i=display.height()-1; i>=0; i-=4) {
+    display.drawLine(display.width()-1, display.height()-1, 0, i, SSD1306_WHITE);
+    display.display();
+    delay(1);
+  }
+  delay(250);
+
+  display.clearDisplay();
+
+  for(i=0; i<display.height(); i+=4) {
+    display.drawLine(display.width()-1, 0, 0, i, SSD1306_WHITE);
+    display.display();
+    delay(1);
+  }
+  for(i=0; i<display.width(); i+=4) {
+    display.drawLine(display.width()-1, 0, i, display.height()-1, SSD1306_WHITE);
+    display.display();
+    delay(1);
+  }
+
+  delay(2000); // Pause for 2 seconds
+}
+
+void testdrawrect(void) {
+  display.clearDisplay();
+
+  for(int16_t i=0; i<display.height()/2; i+=2) {
+    display.drawRect(i, i, display.width()-2*i, display.height()-2*i, SSD1306_WHITE);
+    display.display(); // Update screen with each newly-drawn rectangle
+    delay(1);
+  }
+
+  delay(2000);
+}
+
+void testfillrect(void) {
+  display.clearDisplay();
+
+  for(int16_t i=0; i<display.height()/2; i+=3) {
+    // The INVERSE color is used so rectangles alternate white/black
+    display.fillRect(i, i, display.width()-i*2, display.height()-i*2, SSD1306_INVERSE);
+    display.display(); // Update screen with each newly-drawn rectangle
+    delay(1);
+  }
+
+  delay(2000);
+}
+
+void testdrawcircle(void) {
+  display.clearDisplay();
+
+  for(int16_t i=0; i<max(display.width(),display.height())/2; i+=2) {
+    display.drawCircle(display.width()/2, display.height()/2, i, SSD1306_WHITE);
+    display.display();
+    delay(1);
+  }
+
+  delay(2000);
+}
+
+void testfillcircle(void) {
+  display.clearDisplay();
+
+  for(int16_t i=max(display.width(),display.height())/2; i>0; i-=3) {
+    // The INVERSE color is used so circles alternate white/black
+    display.fillCircle(display.width() / 2, display.height() / 2, i, SSD1306_INVERSE);
+    display.display(); // Update screen with each newly-drawn circle
+    delay(1);
+  }
+
+  delay(2000);
+}
+
+void testdrawroundrect(void) {
+  display.clearDisplay();
+
+  for(int16_t i=0; i<display.height()/2-2; i+=2) {
+    display.drawRoundRect(i, i, display.width()-2*i, display.height()-2*i,
+      display.height()/4, SSD1306_WHITE);
+    display.display();
+    delay(1);
+  }
+
+  delay(2000);
+}
+
+void testfillroundrect(void) {
+  display.clearDisplay();
+
+  for(int16_t i=0; i<display.height()/2-2; i+=2) {
+    // The INVERSE color is used so round-rects alternate white/black
+    display.fillRoundRect(i, i, display.width()-2*i, display.height()-2*i,
+      display.height()/4, SSD1306_INVERSE);
+    display.display();
+    delay(1);
+  }
+
+  delay(2000);
+}
+
+void testdrawtriangle(void) {
+  display.clearDisplay();
+
+  for(int16_t i=0; i<max(display.width(),display.height())/2; i+=5) {
+    display.drawTriangle(
+      display.width()/2  , display.height()/2-i,
+      display.width()/2-i, display.height()/2+i,
+      display.width()/2+i, display.height()/2+i, SSD1306_WHITE);
+    display.display();
+    delay(1);
+  }
+
+  delay(2000);
+}
+
+void testfilltriangle(void) {
+  display.clearDisplay();
+
+  for(int16_t i=max(display.width(),display.height())/2; i>0; i-=5) {
+    // The INVERSE color is used so triangles alternate white/black
+    display.fillTriangle(
+      display.width()/2  , display.height()/2-i,
+      display.width()/2-i, display.height()/2+i,
+      display.width()/2+i, display.height()/2+i, SSD1306_INVERSE);
+    display.display();
+    delay(1);
+  }
+
+  delay(2000);
+}
+
+void testdrawchar(void) {
+  display.clearDisplay();
+
+  display.setTextSize(1);      // Normal 1:1 pixel scale
+  display.setTextColor(SSD1306_WHITE); // Draw white text
+  display.setCursor(0, 0);     // Start at top-left corner
+  display.cp437(true);         // Use full 256 char 'Code Page 437' font
+
+  // Not all the characters will fit on the display. This is normal.
+  // Library will draw what it can and the rest will be clipped.
+  for(int16_t i=0; i<256; i++) {
+    if(i == '\n') display.write(' ');
+    else          display.write(i);
+  }
+
+  display.display();
+  delay(2000);
+}
+
+void testdrawstyles(void) {
+  display.clearDisplay();
+
+  display.setTextSize(1);             // Normal 1:1 pixel scale
+  display.setTextColor(SSD1306_WHITE);        // Draw white text
+  display.setCursor(0,0);             // Start at top-left corner
+  display.println(F("Hello, world!"));
+
+  display.setTextColor(SSD1306_BLACK, SSD1306_WHITE); // Draw 'inverse' text
+  display.println(3.141592);
+
+  display.setTextSize(2);             // Draw 2X-scale text
+  display.setTextColor(SSD1306_WHITE);
+  display.print(F("0x")); display.println(0xDEADBEEF, HEX);
+
+  display.display();
+  delay(2000);
+}
+
+void testscrolltext(void) {
+  display.clearDisplay();
+
+  display.setTextSize(2); // Draw 2X-scale text
+  display.setTextColor(SSD1306_WHITE);
+  display.setCursor(10, 0);
+  display.println(F("scroll"));
+  display.display();      // Show initial text
+  delay(100);
+
+  // Scroll in various directions, pausing in-between:
+  display.startscrollright(0x00, 0x0F);
+  delay(2000);
+  display.stopscroll();
+  delay(1000);
+  display.startscrollleft(0x00, 0x0F);
+  delay(2000);
+  display.stopscroll();
+  delay(1000);
+  display.startscrolldiagright(0x00, 0x07);
+  delay(2000);
+  display.startscrolldiagleft(0x00, 0x07);
+  delay(2000);
+  display.stopscroll();
+  delay(1000);
+}
+
+void testdrawbitmap(void) {
+  display.clearDisplay();
+
+  display.drawBitmap(
+    (display.width()  - LOGO_WIDTH ) / 2,
+    (display.height() - LOGO_HEIGHT) / 2,
+    logo_bmp, LOGO_WIDTH, LOGO_HEIGHT, 1);
+  display.display();
+  delay(1000);
+}
+
+#define XPOS   0 // Indexes into the 'icons' array in function below
+#define YPOS   1
+#define DELTAY 2
+
+void testanimate(const uint8_t *bitmap, uint8_t w, uint8_t h) {
+  int8_t f, icons[NUMFLAKES][3];
+
+  // Initialize 'snowflake' positions
+  for(f=0; f< NUMFLAKES; f++) {
+    icons[f][XPOS]   = random(1 - LOGO_WIDTH, display.width());
+    icons[f][YPOS]   = -LOGO_HEIGHT;
+    icons[f][DELTAY] = random(1, 6);
+    Serial.print(F("x: "));
+    Serial.print(icons[f][XPOS], DEC);
+    Serial.print(F(" y: "));
+    Serial.print(icons[f][YPOS], DEC);
+    Serial.print(F(" dy: "));
+    Serial.println(icons[f][DELTAY], DEC);
+  }
+
+  for(;;) { // Loop forever...
+    display.clearDisplay(); // Clear the display buffer
+
+    // Draw each snowflake:
+    for(f=0; f< NUMFLAKES; f++) {
+      display.drawBitmap(icons[f][XPOS], icons[f][YPOS], bitmap, w, h, SSD1306_WHITE);
+    }
+
+    display.display(); // Show the display buffer on the screen
+    delay(200);        // Pause for 1/10 second
+
+    // Then update coordinates of each flake...
+    for(f=0; f< NUMFLAKES; f++) {
+      icons[f][YPOS] += icons[f][DELTAY];
+      // If snowflake is off the bottom of the screen...
+      if (icons[f][YPOS] >= display.height()) {
+        // Reinitialize to a random position, just off the top
+        icons[f][XPOS]   = random(1 - LOGO_WIDTH, display.width());
+        icons[f][YPOS]   = -LOGO_HEIGHT;
+        icons[f][DELTAY] = random(1, 6);
+      }
+    }
+  }
+}
diff --git a/splash.h b/splash.h
index 1520e321..4119af77 100644
--- a/splash.h
+++ b/splash.h
@@ -180,3 +180,25 @@ const uint8_t PROGMEM splash2_data[] = {
     B01111111, B11111111, B11111111, B11111111, B11111110, B10110101, B10101101,
     B11101101, B10110101, B01111110, B11100000,
 };
+
+  
+#define splash3_width   16
+#define splash3_height  16
+
+const uint8_t PROGMEM splash3_data[] = {
+  B00000000, B11000000,
+  B00000001, B11000000,
+  B00000001, B11000000,
+  B00000011, B11100000,
+  B11110011, B11100000,
+  B11111110, B11111000,
+  B01111110, B11111111,
+  B00110011, B10011111,
+  B00011111, B11111100,
+  B00001101, B01110000,
+  B00011011, B10100000,
+  B00111111, B11100000,
+  B00111111, B11110000,
+  B01111100, B11110000,
+  B01110000, B01110000,
+  B00000000, B00110000 };

From 9ea6e58b42f0f6b22b10bafb28157bac4d61afe0 Mon Sep 17 00:00:00 2001
From: "Dirk O. Kaar" <dok@dok-net.net>
Date: Fri, 22 Mar 2019 11:03:41 +0100
Subject: [PATCH 2/9] Created proper Adafruit splash screen image for 64x48
 screen size.

---
 splash.h | 45 +++++++++++++++++++++++++++------------------
 1 file changed, 27 insertions(+), 18 deletions(-)

diff --git a/splash.h b/splash.h
index 4119af77..b3dae8dc 100644
--- a/splash.h
+++ b/splash.h
@@ -182,23 +182,32 @@ const uint8_t PROGMEM splash2_data[] = {
 };
 
   
-#define splash3_width   16
-#define splash3_height  16
+#define splash3_width   64
+#define splash3_height  48
 
 const uint8_t PROGMEM splash3_data[] = {
-  B00000000, B11000000,
-  B00000001, B11000000,
-  B00000001, B11000000,
-  B00000011, B11100000,
-  B11110011, B11100000,
-  B11111110, B11111000,
-  B01111110, B11111111,
-  B00110011, B10011111,
-  B00011111, B11111100,
-  B00001101, B01110000,
-  B00011011, B10100000,
-  B00111111, B11100000,
-  B00111111, B11110000,
-  B01111100, B11110000,
-  B01110000, B01110000,
-  B00000000, B00110000 };
+	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, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x01, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xf1, 0xf8, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x01, 0xff, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xb7, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x7f, 0xbf, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0xbf, 0xf8, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x3e, 0xc3, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xff, 0xc0, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x0e, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, 0xdc, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x3f, 0xdc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0x7e, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x3f, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0x7e, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x70, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x01, 0x80, 0x00, 0x80, 0x00, 
+	0x00, 0x00, 0x18, 0x03, 0x80, 0x00, 0x80, 0x00, 0x00, 0x00, 0x18, 0x03, 0x00, 0x00, 0x30, 0x00, 
+	0x00, 0xf9, 0xf9, 0xf3, 0xb6, 0xc4, 0xbc, 0x00, 0x01, 0x99, 0xb9, 0x1b, 0x3e, 0xc4, 0xb0, 0x00, 
+	0x00, 0x0b, 0x18, 0x1b, 0x30, 0xc4, 0xb0, 0x00, 0x01, 0xfb, 0x19, 0xfb, 0x30, 0xc4, 0xb0, 0x00, 
+	0x01, 0x8b, 0x1b, 0x1b, 0x30, 0xc4, 0xb0, 0x00, 0x01, 0x8b, 0x1b, 0x1b, 0x30, 0xc4, 0xb0, 0x00, 
+	0x01, 0xf9, 0xfb, 0xfb, 0x30, 0xf4, 0xbc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xff, 0xff, 0xfe, 0x67, 0x59, 0xdc, 0x00, 
+	0x01, 0xff, 0xff, 0xfe, 0x67, 0x59, 0xdc, 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
+};

From c6605514849a89fa1281f5e85a6453b6602798d7 Mon Sep 17 00:00:00 2001
From: "Dirk O. Kaar" <dok@dok-net.net>
Date: Mon, 13 May 2019 20:37:02 +0200
Subject: [PATCH 3/9] Fix for random uninitialized data in display RAM for
 displays less than 128 segments wide.

Bug was visible when scrolling.
TDB: allow drawing outside visible area to exploit full 128 horizontal resolution in hardware scrolling.
---
 Adafruit_SSD1306.cpp | 72 ++++++++++++++++++++------------------------
 Adafruit_SSD1306.h   | 10 +++---
 2 files changed, 39 insertions(+), 43 deletions(-)

diff --git a/Adafruit_SSD1306.cpp b/Adafruit_SSD1306.cpp
index 1955c591..d8260796 100644
--- a/Adafruit_SSD1306.cpp
+++ b/Adafruit_SSD1306.cpp
@@ -463,7 +463,7 @@ void Adafruit_SSD1306::ssd1306_command(uint8_t c) {
 bool Adafruit_SSD1306::begin(uint8_t vcs, uint8_t addr, bool reset,
                              bool periphBegin) {
 
-  if ((!buffer) && !(buffer = (uint8_t *)malloc(WIDTH * ((HEIGHT + 7) / 8))))
+  if ((!buffer) && !(buffer = (uint8_t *)malloc(SSD1306_SEGMENTS * ((HEIGHT + 7) / 8))))
     return false;
 
   clearDisplay();
@@ -632,16 +632,17 @@ void Adafruit_SSD1306::drawPixel(int16_t x, int16_t y, uint16_t color) {
       y = HEIGHT - y - 1;
       break;
     }
+    if ((WIDTH == 64) && (HEIGHT == 48)) x += 32;
     switch (color) {
-    case SSD1306_WHITE:
-      buffer[x + (y / 8) * WIDTH] |= (1 << (y & 7));
-      break;
-    case SSD1306_BLACK:
-      buffer[x + (y / 8) * WIDTH] &= ~(1 << (y & 7));
-      break;
-    case SSD1306_INVERSE:
-      buffer[x + (y / 8) * WIDTH] ^= (1 << (y & 7));
-      break;
+     case SSD1306_WHITE:
+       buffer[x + (y / 8) * SSD1306_SEGMENTS] |=  (1 << (y & 7));
+       break;
+     case SSD1306_BLACK:
+       buffer[x + (y / 8) * SSD1306_SEGMENTS] &= ~(1 << (y & 7));
+       break;
+     case SSD1306_INVERSE:
+       buffer[x + (y / 8) * SSD1306_SEGMENTS] ^=  (1 << (y & 7));
+       break;
     }
   }
 }
@@ -654,7 +655,7 @@ void Adafruit_SSD1306::drawPixel(int16_t x, int16_t y, uint16_t color) {
             commands as needed by one's own application.
 */
 void Adafruit_SSD1306::clearDisplay(void) {
-  memset(buffer, 0, WIDTH * ((HEIGHT + 7) / 8));
+  memset(buffer, 0, SSD1306_SEGMENTS * ((HEIGHT + 7) / 8));
 }
 
 /*!
@@ -717,7 +718,9 @@ void Adafruit_SSD1306::drawFastHLineInternal(int16_t x, int16_t y, int16_t w,
       w = (WIDTH - x);
     }
     if (w > 0) { // Proceed only if width is positive
-      uint8_t *pBuf = &buffer[(y / 8) * WIDTH + x], mask = 1 << (y & 7);
+      if ((WIDTH == 64) && (HEIGHT == 48)) x += 32;
+      uint8_t* pBuf = &buffer[x + (y / 8) * SSD1306_SEGMENTS];
+      uint8_t mask = 1 << (y & 7);
       switch (color) {
       case SSD1306_WHITE:
         while (w--) {
@@ -803,7 +806,8 @@ void Adafruit_SSD1306::drawFastVLineInternal(int16_t x, int16_t __y,
       // this display doesn't need ints for coordinates,
       // use local byte registers for faster juggling
       uint8_t y = __y, h = __h;
-      uint8_t *pBuf = &buffer[(y / 8) * WIDTH + x];
+      if ((WIDTH == 64) && (HEIGHT == 48)) x += 32;
+      uint8_t *pBuf = &buffer[x + (y / 8) * SSD1306_SEGMENTS];
 
       // do the first partial byte, if necessary - this requires some masking
       uint8_t mod = (y & 7);
@@ -831,7 +835,7 @@ void Adafruit_SSD1306::drawFastVLineInternal(int16_t x, int16_t __y,
           *pBuf ^= mask;
           break;
         }
-        pBuf += WIDTH;
+        pBuf += SSD1306_SEGMENTS;
       }
 
       if (h >= mod) { // More to go?
@@ -843,7 +847,7 @@ void Adafruit_SSD1306::drawFastVLineInternal(int16_t x, int16_t __y,
             // black/white write version with an extra comparison per loop
             do {
               *pBuf ^= 0xFF; // Invert byte
-              pBuf += WIDTH; // Advance pointer 8 rows
+              pBuf  += SSD1306_SEGMENTS; // Advance pointer 8 rows
               h -= 8;        // Subtract 8 rows from height
             } while (h >= 8);
           } else {
@@ -851,7 +855,7 @@ void Adafruit_SSD1306::drawFastVLineInternal(int16_t x, int16_t __y,
             uint8_t val = (color != SSD1306_BLACK) ? 255 : 0;
             do {
               *pBuf = val;   // Set byte
-              pBuf += WIDTH; // Advance pointer 8 rows
+              pBuf += SSD1306_SEGMENTS;  // Advance pointer 8 rows
               h -= 8;        // Subtract 8 rows from height
             } while (h >= 8);
           }
@@ -912,7 +916,8 @@ bool Adafruit_SSD1306::getPixel(int16_t x, int16_t y) {
       y = HEIGHT - y - 1;
       break;
     }
-    return (buffer[x + (y / 8) * WIDTH] & (1 << (y & 7)));
+    if ((WIDTH == 64) && (HEIGHT == 48)) x += 32;
+    return (buffer[x + (y / 8) * SSD1306_SEGMENTS] & (1 << (y & 7)));
   }
   return false; // Pixel out of bounds
 }
@@ -935,27 +940,16 @@ uint8_t *Adafruit_SSD1306::getBuffer(void) { return buffer; }
 */
 void Adafruit_SSD1306::display(void) {
   TRANSACTION_START
-  if ((WIDTH != 64) || (HEIGHT != 48)) {
-    static const uint8_t PROGMEM dlist1a[] = {
-      SSD1306_PAGEADDR,
-      0,                         // Page start address
-      0xFF,                      // Page end (not really, but works here)
-      SSD1306_COLUMNADDR,
-      0 };                       // Column start address
-    ssd1306_commandList(dlist1a, sizeof(dlist1a));
-    ssd1306_command1(WIDTH - 1); // Column end address
-  } else {
-    static const uint8_t PROGMEM dlist1b[] = {
-      SSD1306_PAGEADDR,
-      0 };                       // Page start address
-    ssd1306_commandList(dlist1b, sizeof(dlist1b));
-    ssd1306_command1((HEIGHT / 8) - 1); // Page end address
-    static const uint8_t PROGMEM dlist2b[] = {
-      SSD1306_COLUMNADDR,
-      32 };                       // Column start address
-    ssd1306_commandList(dlist2b, sizeof(dlist2b));
-    ssd1306_command1(32 + WIDTH - 1); // Column end address
-  }
+  static const uint8_t PROGMEM dlist1[] = {
+    SSD1306_PAGEADDR,
+    0 };                       // Page start address
+  ssd1306_commandList(dlist1, sizeof(dlist1));
+  ssd1306_command1((HEIGHT + 7) / 8 - 1); // Page end address
+  static const uint8_t PROGMEM dlist2[] = {
+    SSD1306_COLUMNADDR,
+    0 };                       // Column start address
+  ssd1306_commandList(dlist2, sizeof(dlist2));
+  ssd1306_command1(SSD1306_SEGMENTS - 1); // Column end address
 
 #if defined(ESP8266)
   // ESP8266 needs a periodic yield() call to avoid watchdog reset.
@@ -966,7 +960,7 @@ void Adafruit_SSD1306::display(void) {
   // 32-byte transfer condition below.
   yield();
 #endif
-  uint16_t count = WIDTH * ((HEIGHT + 7) / 8);
+  uint16_t count = SSD1306_SEGMENTS * ((HEIGHT + 7) / 8);
   uint8_t *ptr = buffer;
   if (wire) { // I2C
     wire->beginTransmission(i2caddr);
diff --git a/Adafruit_SSD1306.h b/Adafruit_SSD1306.h
index bba75c0f..63379dd4 100644
--- a/Adafruit_SSD1306.h
+++ b/Adafruit_SSD1306.h
@@ -106,6 +106,8 @@ typedef uint32_t PortMask;
 #define SSD1306_ACTIVATE_SCROLL 0x2F                      ///< Start scroll
 #define SSD1306_SET_VERTICAL_SCROLL_AREA 0xA3             ///< Set scroll range
 
+#define SSD1306_SEGMENTS			128 ///< See datasheet
+
 // Deprecated size stuff for backwards compatibility with old sketches
 #if defined SSD1306_128_64
 #define SSD1306_LCDWIDTH 128 ///< DEPRECATED: width w/SSD1306_128_64 defined
@@ -151,11 +153,11 @@ class Adafruit_SSD1306 : public Adafruit_GFX {
              bool reset = true, bool periphBegin = true);
   void display(void);
   void clearDisplay(void);
-  void invertDisplay(bool i);
+  virtual void invertDisplay(bool i) override;
   void dim(bool dim);
-  void drawPixel(int16_t x, int16_t y, uint16_t color);
-  virtual void drawFastHLine(int16_t x, int16_t y, int16_t w, uint16_t color);
-  virtual void drawFastVLine(int16_t x, int16_t y, int16_t h, uint16_t color);
+  virtual void drawPixel(int16_t x, int16_t y, uint16_t color) override;
+  virtual void drawFastHLine(int16_t x, int16_t y, int16_t w, uint16_t color) override;
+  virtual void drawFastVLine(int16_t x, int16_t y, int16_t h, uint16_t color) override;
   void startscrollright(uint8_t start, uint8_t stop);
   void startscrollleft(uint8_t start, uint8_t stop);
   void startscrolldiagright(uint8_t start, uint8_t stop);

From 1607dd77de19e46fd61e71ed047a1cd3472a485b Mon Sep 17 00:00:00 2001
From: "Dirk O. Kaar" <dok@dok-net.net>
Date: Wed, 16 Dec 2020 13:15:08 +0100
Subject: [PATCH 4/9] Fix what appears to be a rebasing error.

---
 Adafruit_SSD1306.cpp | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/Adafruit_SSD1306.cpp b/Adafruit_SSD1306.cpp
index d8260796..4d89be62 100644
--- a/Adafruit_SSD1306.cpp
+++ b/Adafruit_SSD1306.cpp
@@ -541,11 +541,17 @@ bool Adafruit_SSD1306::begin(uint8_t vcs, uint8_t addr, bool reset,
   ssd1306_command1(HEIGHT - 1);
 
   static const uint8_t PROGMEM init2[] = {SSD1306_SETDISPLAYOFFSET, // 0xD3
-                                          0x0,                      // no offset
-                                          SSD1306_SETSTARTLINE | 0x0, // line #0
-                                          SSD1306_CHARGEPUMP};        // 0x8D
+                                          0x0);                     // no offset
   ssd1306_commandList(init2, sizeof(init2));
 
+  if ((WIDTH == 64) && (HEIGHT == 32)) {
+    ssd1306_command1(0x00); // line #0
+  } else {
+    ssd1306_command1(SSD1306_SETSTARTLINE); // 0x40
+  }
+
+  ssd1306_command1(SSD1306_CHARGEPUMP}; // 0x8D
+
   ssd1306_command1((vccstate == SSD1306_EXTERNALVCC) ? 0x10 : 0x14);
 
   static const uint8_t PROGMEM init3[] = {SSD1306_MEMORYMODE, // 0x20
@@ -566,13 +572,9 @@ bool Adafruit_SSD1306::begin(uint8_t vcs, uint8_t addr, bool reset,
   } else if ((WIDTH == 96) && (HEIGHT == 16)) {
     comPins = 0x2; // ada x12
     contrast = (vccstate == SSD1306_EXTERNALVCC) ? 0x10 : 0xAF;
-  } else if ((WIDTH == 64) && (HEIGHT == 48)) {
-    static const uint8_t PROGMEM init4d[] = {
-      SSD1306_SETCOMPINS,                 // 0xDA
-      0x12,
-      SSD1306_SETCONTRAST };              // 0x81
-    ssd1306_commandList(init4d, sizeof(init4d));
-    ssd1306_command1((vccstate == SSD1306_EXTERNALVCC) ? 0x9F : 0xCF);
+  } else if ((WIDTH == 64) && ((HEIGHT == 48) || (HEIGHT == 32))) {
+    comPins = 0x12;
+    contrast = (vccstate == SSD1306_EXTERNALVCC) ? 0x9F : 0xCF);
   } else {
     // Other screen varieties -- TBD
   }

From d4c41c392c3cf6efaf27d15193c0eb8d8c5a1513 Mon Sep 17 00:00:00 2001
From: "Dirk O. Kaar" <dok@dok-net.net>
Date: Thu, 17 Dec 2020 15:39:02 +0100
Subject: [PATCH 5/9] Reverted added override to avoid requiring C++11.

---
 Adafruit_SSD1306.h | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/Adafruit_SSD1306.h b/Adafruit_SSD1306.h
index 63379dd4..293f569c 100644
--- a/Adafruit_SSD1306.h
+++ b/Adafruit_SSD1306.h
@@ -24,11 +24,12 @@
 #ifndef _Adafruit_SSD1306_H_
 #define _Adafruit_SSD1306_H_
 
-// ONE of the following four lines must be #defined:
+// ONE of the following lines must be #defined:
 //#define SSD1306_128_64 ///< DEPRECTAED: old way to specify 128x64 screen
 #define SSD1306_128_32 ///< DEPRECATED: old way to specify 128x32 screen
 //#define SSD1306_96_16  ///< DEPRECATED: old way to specify 96x16 screen
 //#define SSD1306_64_48  ///< DEPRECATED: old way to specify 64x48 screen
+//#define SSD1306_64_32  ///< DEPRECATED: old way to specify 64x32 screen
 // This establishes the screen dimensions in old Adafruit_SSD1306 sketches
 // (NEW CODE SHOULD IGNORE THIS, USE THE CONSTRUCTORS THAT ACCEPT WIDTH
 // AND HEIGHT ARGUMENTS).
@@ -125,6 +126,10 @@ typedef uint32_t PortMask;
  #define SSD1306_LCDWIDTH   64 ///< DEPRECATED: width w/SSD1306_64_48 defined
  #define SSD1306_LCDHEIGHT  48 ///< DEPRECATED: height w/SSD1306_64_48 defined
 #endif
+#if defined SSD1306_64_32
+ #define SSD1306_LCDWIDTH   64 ///< DEPRECATED: width w/SSD1306_64_32 defined
+ #define SSD1306_LCDHEIGHT  32 ///< DEPRECATED: height w/SSD1306_64_32 defined
+#endif
 
 /*!
     @brief  Class that stores state and functions for interacting with
@@ -153,11 +158,11 @@ class Adafruit_SSD1306 : public Adafruit_GFX {
              bool reset = true, bool periphBegin = true);
   void display(void);
   void clearDisplay(void);
-  virtual void invertDisplay(bool i) override;
+  virtual void invertDisplay(bool i);
   void dim(bool dim);
-  virtual void drawPixel(int16_t x, int16_t y, uint16_t color) override;
-  virtual void drawFastHLine(int16_t x, int16_t y, int16_t w, uint16_t color) override;
-  virtual void drawFastVLine(int16_t x, int16_t y, int16_t h, uint16_t color) override;
+  virtual void drawPixel(int16_t x, int16_t y, uint16_t color);
+  virtual void drawFastHLine(int16_t x, int16_t y, int16_t w, uint16_t color);
+  virtual void drawFastVLine(int16_t x, int16_t y, int16_t h, uint16_t color);
   void startscrollright(uint8_t start, uint8_t stop);
   void startscrollleft(uint8_t start, uint8_t stop);
   void startscrolldiagright(uint8_t start, uint8_t stop);

From f5fd32ffaa4f39489e8a00ea6520c20348719294 Mon Sep 17 00:00:00 2001
From: "Dirk O. Kaar" <dok@dok-net.net>
Date: Thu, 17 Dec 2020 15:55:17 +0100
Subject: [PATCH 6/9] Curb whitespace changes for diff

---
 Adafruit_SSD1306.cpp | 32 ++++++++++++++++----------------
 Adafruit_SSD1306.h   |  4 ++--
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/Adafruit_SSD1306.cpp b/Adafruit_SSD1306.cpp
index 4d89be62..84c6d9ca 100644
--- a/Adafruit_SSD1306.cpp
+++ b/Adafruit_SSD1306.cpp
@@ -470,12 +470,12 @@ bool Adafruit_SSD1306::begin(uint8_t vcs, uint8_t addr, bool reset,
   if (WIDTH > 64 && HEIGHT > 32) {
     drawBitmap((WIDTH - splash1_width) / 2, (HEIGHT - splash1_height) / 2,
                splash1_data, splash1_width, splash1_height, 1);
-  } else if(WIDTH > 64) {
+  } else if (WIDTH > 64) {
     drawBitmap((WIDTH - splash2_width) / 2, (HEIGHT - splash2_height) / 2,
                splash2_data, splash2_width, splash2_height, 1);
   } else {
     drawBitmap((WIDTH - splash3_width) / 2, (HEIGHT - splash3_height) / 2,
-      splash3_data, splash3_width, splash3_height, 1);
+               splash3_data, splash3_width, splash3_height, 1);
   }
 
   vccstate = vcs;
@@ -636,15 +636,15 @@ void Adafruit_SSD1306::drawPixel(int16_t x, int16_t y, uint16_t color) {
     }
     if ((WIDTH == 64) && (HEIGHT == 48)) x += 32;
     switch (color) {
-     case SSD1306_WHITE:
-       buffer[x + (y / 8) * SSD1306_SEGMENTS] |=  (1 << (y & 7));
-       break;
-     case SSD1306_BLACK:
-       buffer[x + (y / 8) * SSD1306_SEGMENTS] &= ~(1 << (y & 7));
-       break;
-     case SSD1306_INVERSE:
-       buffer[x + (y / 8) * SSD1306_SEGMENTS] ^=  (1 << (y & 7));
-       break;
+    case SSD1306_WHITE:
+      buffer[x + (y / 8) * SSD1306_SEGMENTS] |=  (1 << (y & 7));
+      break;
+    case SSD1306_BLACK:
+      buffer[x + (y / 8) * SSD1306_SEGMENTS] &= ~(1 << (y & 7));
+      break;
+    case SSD1306_INVERSE:
+      buffer[x + (y / 8) * SSD1306_SEGMENTS] ^=  (1 << (y & 7));
+      break;
     }
   }
 }
@@ -849,7 +849,7 @@ void Adafruit_SSD1306::drawFastVLineInternal(int16_t x, int16_t __y,
             // black/white write version with an extra comparison per loop
             do {
               *pBuf ^= 0xFF; // Invert byte
-              pBuf  += SSD1306_SEGMENTS; // Advance pointer 8 rows
+              pBuf += SSD1306_SEGMENTS; // Advance pointer 8 rows
               h -= 8;        // Subtract 8 rows from height
             } while (h >= 8);
           } else {
@@ -943,13 +943,13 @@ uint8_t *Adafruit_SSD1306::getBuffer(void) { return buffer; }
 void Adafruit_SSD1306::display(void) {
   TRANSACTION_START
   static const uint8_t PROGMEM dlist1[] = {
-    SSD1306_PAGEADDR,
-    0 };                       // Page start address
+      SSD1306_PAGEADDR,
+      0 };                    // Page start address
   ssd1306_commandList(dlist1, sizeof(dlist1));
   ssd1306_command1((HEIGHT + 7) / 8 - 1); // Page end address
   static const uint8_t PROGMEM dlist2[] = {
-    SSD1306_COLUMNADDR,
-    0 };                       // Column start address
+      SSD1306_COLUMNADDR,
+      0 };                    // Column start address
   ssd1306_commandList(dlist2, sizeof(dlist2));
   ssd1306_command1(SSD1306_SEGMENTS - 1); // Column end address
 
diff --git a/Adafruit_SSD1306.h b/Adafruit_SSD1306.h
index 293f569c..27ae93eb 100644
--- a/Adafruit_SSD1306.h
+++ b/Adafruit_SSD1306.h
@@ -158,9 +158,9 @@ class Adafruit_SSD1306 : public Adafruit_GFX {
              bool reset = true, bool periphBegin = true);
   void display(void);
   void clearDisplay(void);
-  virtual void invertDisplay(bool i);
+  void invertDisplay(bool i);
   void dim(bool dim);
-  virtual void drawPixel(int16_t x, int16_t y, uint16_t color);
+  void drawPixel(int16_t x, int16_t y, uint16_t color);
   virtual void drawFastHLine(int16_t x, int16_t y, int16_t w, uint16_t color);
   virtual void drawFastVLine(int16_t x, int16_t y, int16_t h, uint16_t color);
   void startscrollright(uint8_t start, uint8_t stop);

From dc8967ebcbf23e58538209ad793d9bdef3e1dc33 Mon Sep 17 00:00:00 2001
From: "Dirk O. Kaar" <dok@dok-net.net>
Date: Thu, 17 Dec 2020 17:39:40 +0100
Subject: [PATCH 7/9] Compile and fix syntax errors

---
 Adafruit_SSD1306.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Adafruit_SSD1306.cpp b/Adafruit_SSD1306.cpp
index 84c6d9ca..4ec6eb04 100644
--- a/Adafruit_SSD1306.cpp
+++ b/Adafruit_SSD1306.cpp
@@ -541,7 +541,7 @@ bool Adafruit_SSD1306::begin(uint8_t vcs, uint8_t addr, bool reset,
   ssd1306_command1(HEIGHT - 1);
 
   static const uint8_t PROGMEM init2[] = {SSD1306_SETDISPLAYOFFSET, // 0xD3
-                                          0x0);                     // no offset
+                                          0x0};                     // no offset
   ssd1306_commandList(init2, sizeof(init2));
 
   if ((WIDTH == 64) && (HEIGHT == 32)) {
@@ -550,7 +550,7 @@ bool Adafruit_SSD1306::begin(uint8_t vcs, uint8_t addr, bool reset,
     ssd1306_command1(SSD1306_SETSTARTLINE); // 0x40
   }
 
-  ssd1306_command1(SSD1306_CHARGEPUMP}; // 0x8D
+  ssd1306_command1(SSD1306_CHARGEPUMP); // 0x8D
 
   ssd1306_command1((vccstate == SSD1306_EXTERNALVCC) ? 0x10 : 0x14);
 
@@ -574,7 +574,7 @@ bool Adafruit_SSD1306::begin(uint8_t vcs, uint8_t addr, bool reset,
     contrast = (vccstate == SSD1306_EXTERNALVCC) ? 0x10 : 0xAF;
   } else if ((WIDTH == 64) && ((HEIGHT == 48) || (HEIGHT == 32))) {
     comPins = 0x12;
-    contrast = (vccstate == SSD1306_EXTERNALVCC) ? 0x9F : 0xCF);
+    contrast = (vccstate == SSD1306_EXTERNALVCC) ? 0x9F : 0xCF;
   } else {
     // Other screen varieties -- TBD
   }

From 989e6d529effbbe7aa7ede65fbc2f0c4d38d88d3 Mon Sep 17 00:00:00 2001
From: "Dirk O. Kaar" <dok@dok-net.net>
Date: Thu, 17 Dec 2020 17:55:43 +0100
Subject: [PATCH 8/9] splash3 was manually created, make_splash.py is more
 recent, adding splash3.png and updating Makefile. Not regenerating splash.h
 yet.

---
 scripts/Makefile    |   1 +
 scripts/splash3.png | Bin 0 -> 349 bytes
 2 files changed, 1 insertion(+)
 create mode 100644 scripts/splash3.png

diff --git a/scripts/Makefile b/scripts/Makefile
index 9e892ecb..d4ae7199 100644
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -4,6 +4,7 @@ PY=python3
 splash.h: make_splash.py splash1.png splash2.png
 	${PY} make_splash.py splash1.png splash1 >$@
 	${PY} make_splash.py splash2.png splash2 >>$@
+	${PY} make_splash.py splash3.png splash3 >>$@
 
 clean:
 	rm -f splash.h
diff --git a/scripts/splash3.png b/scripts/splash3.png
new file mode 100644
index 0000000000000000000000000000000000000000..cfc9b07d74c6e79cfed3853fa87b251520bff22d
GIT binary patch
literal 349
zcmV-j0iyniP)<h;3K|Lk000e1NJLTq001cf0015c00000lyqo600009a7bBm000XU
z000XU0RWnu7ytkP4@pEpR5;6xl*_flAPhvWeOw1wQ9(*@dU`cDmAoS45>f#x(a2<h
z<3N69HfD^DH2MLb;YJ@!>N8v<EnSu_$$DMBg`Zkq0m%R7zNnI1F8Oa$Z7?gJ<+nm}
zJ-k;X7+cG~D-cgvtZQH1a&zfG>>`=Dx1qln`XV76wf<2kKkU4oXnl^aLj=IJqve|~
z)8UNxmWTCDQz_QhyS>Y1wo3-g-ZsMa)ljSbQ|<-pP_tn$8DnYhA}MZVcbH{zm&q`h
z1hb~V${fz*6rqqrP7s<XIZZ1U1f+`vDndR{Ws)va43+wtq!;aDV0g-J$op=V7||ki
v5vl(|v@tUSH^Q8tkR3Ndd>rPX_od<v$3y1;I*gqD00000NkvXXu0mjf^$(B3

literal 0
HcmV?d00001


From 4ad7715f7638c2af7869f92ca0d59c2ff0059670 Mon Sep 17 00:00:00 2001
From: "Dirk O. Kaar" <dok@dok-net.net>
Date: Sun, 11 Apr 2021 21:41:49 +0200
Subject: [PATCH 9/9] sources restyled by CI

---
 Adafruit_SSD1306.cpp | 41 +++++++++++++++--------------
 Adafruit_SSD1306.h   | 10 +++----
 splash.h             | 62 ++++++++++++++++++++++++--------------------
 3 files changed, 61 insertions(+), 52 deletions(-)

diff --git a/Adafruit_SSD1306.cpp b/Adafruit_SSD1306.cpp
index 4ec6eb04..249889a6 100644
--- a/Adafruit_SSD1306.cpp
+++ b/Adafruit_SSD1306.cpp
@@ -463,7 +463,8 @@ void Adafruit_SSD1306::ssd1306_command(uint8_t c) {
 bool Adafruit_SSD1306::begin(uint8_t vcs, uint8_t addr, bool reset,
                              bool periphBegin) {
 
-  if ((!buffer) && !(buffer = (uint8_t *)malloc(SSD1306_SEGMENTS * ((HEIGHT + 7) / 8))))
+  if ((!buffer) &&
+      !(buffer = (uint8_t *)malloc(SSD1306_SEGMENTS * ((HEIGHT + 7) / 8))))
     return false;
 
   clearDisplay();
@@ -634,16 +635,17 @@ void Adafruit_SSD1306::drawPixel(int16_t x, int16_t y, uint16_t color) {
       y = HEIGHT - y - 1;
       break;
     }
-    if ((WIDTH == 64) && (HEIGHT == 48)) x += 32;
+    if ((WIDTH == 64) && (HEIGHT == 48))
+      x += 32;
     switch (color) {
     case SSD1306_WHITE:
-      buffer[x + (y / 8) * SSD1306_SEGMENTS] |=  (1 << (y & 7));
+      buffer[x + (y / 8) * SSD1306_SEGMENTS] |= (1 << (y & 7));
       break;
     case SSD1306_BLACK:
       buffer[x + (y / 8) * SSD1306_SEGMENTS] &= ~(1 << (y & 7));
       break;
     case SSD1306_INVERSE:
-      buffer[x + (y / 8) * SSD1306_SEGMENTS] ^=  (1 << (y & 7));
+      buffer[x + (y / 8) * SSD1306_SEGMENTS] ^= (1 << (y & 7));
       break;
     }
   }
@@ -720,8 +722,9 @@ void Adafruit_SSD1306::drawFastHLineInternal(int16_t x, int16_t y, int16_t w,
       w = (WIDTH - x);
     }
     if (w > 0) { // Proceed only if width is positive
-      if ((WIDTH == 64) && (HEIGHT == 48)) x += 32;
-      uint8_t* pBuf = &buffer[x + (y / 8) * SSD1306_SEGMENTS];
+      if ((WIDTH == 64) && (HEIGHT == 48))
+        x += 32;
+      uint8_t *pBuf = &buffer[x + (y / 8) * SSD1306_SEGMENTS];
       uint8_t mask = 1 << (y & 7);
       switch (color) {
       case SSD1306_WHITE:
@@ -808,7 +811,8 @@ void Adafruit_SSD1306::drawFastVLineInternal(int16_t x, int16_t __y,
       // this display doesn't need ints for coordinates,
       // use local byte registers for faster juggling
       uint8_t y = __y, h = __h;
-      if ((WIDTH == 64) && (HEIGHT == 48)) x += 32;
+      if ((WIDTH == 64) && (HEIGHT == 48))
+        x += 32;
       uint8_t *pBuf = &buffer[x + (y / 8) * SSD1306_SEGMENTS];
 
       // do the first partial byte, if necessary - this requires some masking
@@ -848,17 +852,17 @@ void Adafruit_SSD1306::drawFastVLineInternal(int16_t x, int16_t __y,
             // separate copy of the code so we don't impact performance of
             // black/white write version with an extra comparison per loop
             do {
-              *pBuf ^= 0xFF; // Invert byte
+              *pBuf ^= 0xFF;            // Invert byte
               pBuf += SSD1306_SEGMENTS; // Advance pointer 8 rows
-              h -= 8;        // Subtract 8 rows from height
+              h -= 8;                   // Subtract 8 rows from height
             } while (h >= 8);
           } else {
             // store a local value to work with
             uint8_t val = (color != SSD1306_BLACK) ? 255 : 0;
             do {
-              *pBuf = val;   // Set byte
-              pBuf += SSD1306_SEGMENTS;  // Advance pointer 8 rows
-              h -= 8;        // Subtract 8 rows from height
+              *pBuf = val;              // Set byte
+              pBuf += SSD1306_SEGMENTS; // Advance pointer 8 rows
+              h -= 8;                   // Subtract 8 rows from height
             } while (h >= 8);
           }
         }
@@ -918,7 +922,8 @@ bool Adafruit_SSD1306::getPixel(int16_t x, int16_t y) {
       y = HEIGHT - y - 1;
       break;
     }
-    if ((WIDTH == 64) && (HEIGHT == 48)) x += 32;
+    if ((WIDTH == 64) && (HEIGHT == 48))
+      x += 32;
     return (buffer[x + (y / 8) * SSD1306_SEGMENTS] & (1 << (y & 7)));
   }
   return false; // Pixel out of bounds
@@ -942,14 +947,12 @@ uint8_t *Adafruit_SSD1306::getBuffer(void) { return buffer; }
 */
 void Adafruit_SSD1306::display(void) {
   TRANSACTION_START
-  static const uint8_t PROGMEM dlist1[] = {
-      SSD1306_PAGEADDR,
-      0 };                    // Page start address
+  static const uint8_t PROGMEM dlist1[] = {SSD1306_PAGEADDR,
+                                           0}; // Page start address
   ssd1306_commandList(dlist1, sizeof(dlist1));
   ssd1306_command1((HEIGHT + 7) / 8 - 1); // Page end address
-  static const uint8_t PROGMEM dlist2[] = {
-      SSD1306_COLUMNADDR,
-      0 };                    // Column start address
+  static const uint8_t PROGMEM dlist2[] = {SSD1306_COLUMNADDR,
+                                           0}; // Column start address
   ssd1306_commandList(dlist2, sizeof(dlist2));
   ssd1306_command1(SSD1306_SEGMENTS - 1); // Column end address
 
diff --git a/Adafruit_SSD1306.h b/Adafruit_SSD1306.h
index 27ae93eb..711298e6 100644
--- a/Adafruit_SSD1306.h
+++ b/Adafruit_SSD1306.h
@@ -107,7 +107,7 @@ typedef uint32_t PortMask;
 #define SSD1306_ACTIVATE_SCROLL 0x2F                      ///< Start scroll
 #define SSD1306_SET_VERTICAL_SCROLL_AREA 0xA3             ///< Set scroll range
 
-#define SSD1306_SEGMENTS			128 ///< See datasheet
+#define SSD1306_SEGMENTS 128 ///< See datasheet
 
 // Deprecated size stuff for backwards compatibility with old sketches
 #if defined SSD1306_128_64
@@ -123,12 +123,12 @@ typedef uint32_t PortMask;
 #define SSD1306_LCDHEIGHT 16 ///< DEPRECATED: height w/SSD1306_96_16 defined
 #endif
 #if defined SSD1306_64_48
- #define SSD1306_LCDWIDTH   64 ///< DEPRECATED: width w/SSD1306_64_48 defined
- #define SSD1306_LCDHEIGHT  48 ///< DEPRECATED: height w/SSD1306_64_48 defined
+#define SSD1306_LCDWIDTH 64  ///< DEPRECATED: width w/SSD1306_64_48 defined
+#define SSD1306_LCDHEIGHT 48 ///< DEPRECATED: height w/SSD1306_64_48 defined
 #endif
 #if defined SSD1306_64_32
- #define SSD1306_LCDWIDTH   64 ///< DEPRECATED: width w/SSD1306_64_32 defined
- #define SSD1306_LCDHEIGHT  32 ///< DEPRECATED: height w/SSD1306_64_32 defined
+#define SSD1306_LCDWIDTH 64  ///< DEPRECATED: width w/SSD1306_64_32 defined
+#define SSD1306_LCDHEIGHT 32 ///< DEPRECATED: height w/SSD1306_64_32 defined
 #endif
 
 /*!
diff --git a/splash.h b/splash.h
index b3dae8dc..7a2e7dee 100644
--- a/splash.h
+++ b/splash.h
@@ -181,33 +181,39 @@ const uint8_t PROGMEM splash2_data[] = {
     B11101101, B10110101, B01111110, B11100000,
 };
 
-  
-#define splash3_width   64
-#define splash3_height  48
+#define splash3_width 64
+#define splash3_height 48
 
 const uint8_t PROGMEM splash3_data[] = {
-	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, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x01, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xf1, 0xf8, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x01, 0xff, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xb7, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x7f, 0xbf, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0xbf, 0xf8, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x3e, 0xc3, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xff, 0xc0, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x0e, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, 0xdc, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x3f, 0xdc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0x7e, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x3f, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0x7e, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x70, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x01, 0x80, 0x00, 0x80, 0x00, 
-	0x00, 0x00, 0x18, 0x03, 0x80, 0x00, 0x80, 0x00, 0x00, 0x00, 0x18, 0x03, 0x00, 0x00, 0x30, 0x00, 
-	0x00, 0xf9, 0xf9, 0xf3, 0xb6, 0xc4, 0xbc, 0x00, 0x01, 0x99, 0xb9, 0x1b, 0x3e, 0xc4, 0xb0, 0x00, 
-	0x00, 0x0b, 0x18, 0x1b, 0x30, 0xc4, 0xb0, 0x00, 0x01, 0xfb, 0x19, 0xfb, 0x30, 0xc4, 0xb0, 0x00, 
-	0x01, 0x8b, 0x1b, 0x1b, 0x30, 0xc4, 0xb0, 0x00, 0x01, 0x8b, 0x1b, 0x1b, 0x30, 0xc4, 0xb0, 0x00, 
-	0x01, 0xf9, 0xfb, 0xfb, 0x30, 0xf4, 0xbc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xff, 0xff, 0xfe, 0x67, 0x59, 0xdc, 0x00, 
-	0x01, 0xff, 0xff, 0xfe, 0x67, 0x59, 0xdc, 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, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
+    0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xf1, 0xf8, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x01, 0xff, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff,
+    0xb7, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0xbf, 0xf0, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x78, 0xbf, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3e,
+    0xc3, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xff, 0xc0, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x0e, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1c,
+    0xdc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xdc, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x3f, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f,
+    0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0x7e, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x70, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x18, 0x01, 0x80, 0x00, 0x80, 0x00, 0x00, 0x00, 0x18, 0x03,
+    0x80, 0x00, 0x80, 0x00, 0x00, 0x00, 0x18, 0x03, 0x00, 0x00, 0x30, 0x00,
+    0x00, 0xf9, 0xf9, 0xf3, 0xb6, 0xc4, 0xbc, 0x00, 0x01, 0x99, 0xb9, 0x1b,
+    0x3e, 0xc4, 0xb0, 0x00, 0x00, 0x0b, 0x18, 0x1b, 0x30, 0xc4, 0xb0, 0x00,
+    0x01, 0xfb, 0x19, 0xfb, 0x30, 0xc4, 0xb0, 0x00, 0x01, 0x8b, 0x1b, 0x1b,
+    0x30, 0xc4, 0xb0, 0x00, 0x01, 0x8b, 0x1b, 0x1b, 0x30, 0xc4, 0xb0, 0x00,
+    0x01, 0xf9, 0xfb, 0xfb, 0x30, 0xf4, 0xbc, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x01, 0xff, 0xff, 0xfe, 0x67, 0x59, 0xdc, 0x00, 0x01, 0xff, 0xff, 0xfe,
+    0x67, 0x59, 0xdc, 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};