Greg Steiert
Modified library to add delay after releasing reset. This is needed because the reset signal is enabling an LDO to provide power to the display and it needs time to turn on.
Fork of
Adafruit_GFX
by 
Neal Horman
Revision 4:853097cfa773, committed 2014-04-29
- Comitter:
- chrta
- Date:
- Tue Apr 29 19:27:01 2014 +0000
- Parent:
- 3:969ca9fe5e2b
- Child:
- 5:315de3647c9f
- Commit message:
- Remove some duplicated code.
Changed in this revision
| Adafruit_SSD1306.cpp | Show annotated file Show diff for this revision Revisions of this file |
--- a/Adafruit_SSD1306.cpp Wed Jan 23 02:43:38 2013 +0000
+++ b/Adafruit_SSD1306.cpp Tue Apr 29 19:27:01 2014 +0000
@@ -115,12 +115,22 @@
// turn on VCC (9V?)
#if defined SSD1306_128_32
- // Init sequence for 128x32 OLED module
+ uint8_t setmultiplex = 0x1F;
+ uint8_t setcompins = 0x02;
+ uint8_t setcontrast = 0x8F;
+#elif defined SSD1306_128_64
+ uint8_t setmultiplex = 0x3F;
+ uint8_t setcompins = 0x12;
+ uint8_t setcontrast = (vccstate == SSD1306_EXTERNALVCC) ? 0x9F : 0xCF;
+#else
+#error "Display dimensions must be defined"
+#endif
+
ssd1306_command(SSD1306_DISPLAYOFF); // 0xAE
ssd1306_command(SSD1306_SETDISPLAYCLOCKDIV); // 0xD5
ssd1306_command(0x80); // the suggested ratio 0x80
ssd1306_command(SSD1306_SETMULTIPLEX); // 0xA8
- ssd1306_command(0x1F);
+ ssd1306_command(setmultiplex);
ssd1306_command(SSD1306_SETDISPLAYOFFSET); // 0xD3
ssd1306_command(0x0); // no offset
ssd1306_command(SSD1306_SETSTARTLINE | 0x0); // line #0
@@ -134,9 +144,9 @@
ssd1306_command(SSD1306_SEGREMAP | 0x1);
ssd1306_command(SSD1306_COMSCANDEC);
ssd1306_command(SSD1306_SETCOMPINS); // 0xDA
- ssd1306_command(0x02);
+ ssd1306_command(setcompins);
ssd1306_command(SSD1306_SETCONTRAST); // 0x81
- ssd1306_command(0x8F);
+ ssd1306_command(setcontrast);
ssd1306_command(SSD1306_SETPRECHARGE); // 0xd9
if (vccstate == SSD1306_EXTERNALVCC)
{ ssd1306_command(0x22); }
@@ -146,44 +156,6 @@
ssd1306_command(0x40);
ssd1306_command(SSD1306_DISPLAYALLON_RESUME); // 0xA4
ssd1306_command(SSD1306_NORMALDISPLAY); // 0xA6
-#endif
-
-#if defined SSD1306_128_64
- // Init sequence for 128x64 OLED module
- ssd1306_command(SSD1306_DISPLAYOFF); // 0xAE
- ssd1306_command(SSD1306_SETDISPLAYCLOCKDIV); // 0xD5
- ssd1306_command(0x80); // the suggested ratio 0x80
- ssd1306_command(SSD1306_SETMULTIPLEX); // 0xA8
- ssd1306_command(0x3F);
- ssd1306_command(SSD1306_SETDISPLAYOFFSET); // 0xD3
- ssd1306_command(0x0); // no offset
- ssd1306_command(SSD1306_SETSTARTLINE | 0x0); // line #0
- ssd1306_command(SSD1306_CHARGEPUMP); // 0x8D
- if (vccstate == SSD1306_EXTERNALVCC)
- { ssd1306_command(0x10); }
- else
- { ssd1306_command(0x14); }
- ssd1306_command(SSD1306_MEMORYMODE); // 0x20
- ssd1306_command(0x00); // 0x0 act like ks0108
- ssd1306_command(SSD1306_SEGREMAP | 0x1);
- ssd1306_command(SSD1306_COMSCANDEC);
- ssd1306_command(SSD1306_SETCOMPINS); // 0xDA
- ssd1306_command(0x12);
- ssd1306_command(SSD1306_SETCONTRAST); // 0x81
- if (vccstate == SSD1306_EXTERNALVCC)
- { ssd1306_command(0x9F); }
- else
- { ssd1306_command(0xCF); }
- ssd1306_command(SSD1306_SETPRECHARGE); // 0xd9
- if (vccstate == SSD1306_EXTERNALVCC)
- { ssd1306_command(0x22); }
- else
- { ssd1306_command(0xF1); }
- ssd1306_command(SSD1306_SETVCOMDETECT); // 0xDB
- ssd1306_command(0x40);
- ssd1306_command(SSD1306_DISPLAYALLON_RESUME); // 0xA4
- ssd1306_command(SSD1306_NORMALDISPLAY); // 0xA6
-#endif
ssd1306_command(SSD1306_DISPLAYON);//--turn on oled panel
}