Skip to content

Commit f251ae5

Browse files
authored
Merge pull request #188 from Rotzbua/patch-3
use new SSD*Wire class instead of old legacy
2 parents affbd18 + 22ba7a5 commit f251ae5

File tree

6 files changed

+19
-22
lines changed

6 files changed

+19
-22
lines changed

examples/SSD1306ClockDemo/SSD1306ClockDemo.ino

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@
3232
// Include the correct display library
3333
// For a connection via I2C using Wire include
3434
#include <Wire.h> // Only needed for Arduino 1.6.5 and earlier
35-
#include "SSD1306.h" // alias for `#include "SSD1306Wire.h"`
36-
// or #include "SH1106.h" alis for `#include "SH1106Wire.h"`
35+
#include "SSD1306Wire.h" // legacy include: `#include "SSD1306.h"`
36+
// or #include "SH1106Wire.h", legacy include: `#include "SH1106.h"`
3737
// For a connection via I2C using brzo_i2c (must be installed) include
3838
// #include <brzo_i2c.h> // Only needed for Arduino 1.6.5 and earlier
3939
// #include "SSD1306Brzo.h"
@@ -69,7 +69,7 @@
6969
// SH1106Brzo display(0x3c, D3, D5);
7070

7171
// Initialize the OLED display using Wire library
72-
SSD1306 display(0x3c, D3, D5);
72+
SSD1306Wire display(0x3c, D3, D5);
7373
// SH1106 display(0x3c, D3, D5);
7474

7575
OLEDDisplayUi ui ( &display );

examples/SSD1306DrawingDemo/SSD1306DrawingDemo.ino

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
// Include the correct display library
3232
// For a connection via I2C using Wire include
3333
#include <Wire.h> // Only needed for Arduino 1.6.5 and earlier
34-
#include "SSD1306.h" // alias for `#include "SSD1306Wire.h"`
35-
// or #include "SH1106.h" alis for `#include "SH1106Wire.h"`
34+
#include "SSD1306Wire.h" // legacy include: `#include "SSD1306.h"`
35+
// or #include "SH1106Wire.h", legacy include: `#include "SH1106.h"`
3636
// For a connection via I2C using brzo_i2c (must be installed) include
3737
// #include <brzo_i2c.h> // Only needed for Arduino 1.6.5 and earlier
3838
// #include "SSD1306Brzo.h"
@@ -62,7 +62,7 @@
6262
// SH1106Brzo display(0x3c, D3, D5);
6363

6464
// Initialize the OLED display using Wire library
65-
SSD1306 display(0x3c, D3, D5);
65+
SSD1306Wire display(0x3c, D3, D5);
6666
// SH1106 display(0x3c, D3, D5);
6767

6868
// Adapted from Adafruit_SSD1306

examples/SSD1306OTADemo/SSD1306OTADemo.ino

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@
4242
// Include the correct display library
4343
// For a connection via I2C using Wire include
4444
#include <Wire.h> // Only needed for Arduino 1.6.5 and earlier
45-
#include "SSD1306.h" // alias for `#include "SSD1306Wire.h"`
46-
// or #include "SH1106.h" alis for `#include "SH1106Wire.h"`
45+
#include "SSD1306Wire.h" // legacy include: `#include "SSD1306.h"`
46+
// or #include "SH1106Wire.h", legacy include: `#include "SH1106.h"`
4747
// For a connection via I2C using brzo_i2c (must be installed) include
4848
// #include <brzo_i2c.h> // Only needed for Arduino 1.6.5 and earlier
4949
// #include "SSD1306Brzo.h"
@@ -73,7 +73,7 @@
7373
// SH1106Brzo display(0x3c, D3, D5);
7474

7575
// Initialize the OLED display using Wire library
76-
SSD1306 display(0x3c, D3, D5);
76+
SSD1306Wire display(0x3c, D3, D5);
7777
// SH1106 display(0x3c, D3, D5);
7878

7979

examples/SSD1306SimpleDemo/SSD1306SimpleDemo.ino

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
// Include the correct display library
3232
// For a connection via I2C using Wire include
3333
#include <Wire.h> // Only needed for Arduino 1.6.5 and earlier
34-
#include "SSD1306.h" // alias for `#include "SSD1306Wire.h"`
35-
// or #include "SH1106.h" alias for `#include "SH1106Wire.h"`
34+
#include "SSD1306Wire.h" // legacy include: `#include "SSD1306.h"`
35+
// or #include "SH1106Wire.h", legacy include: `#include "SH1106.h"`
3636
// For a connection via I2C using brzo_i2c (must be installed) include
3737
// #include <brzo_i2c.h> // Only needed for Arduino 1.6.5 and earlier
3838
// #include "SSD1306Brzo.h"
@@ -63,7 +63,7 @@
6363
// SH1106Brzo display(0x3c, D3, D5);
6464

6565
// Initialize the OLED display using Wire library
66-
SSD1306 display(0x3c, D3, D5);
66+
SSD1306Wire display(0x3c, D3, D5);
6767
// SH1106 display(0x3c, D3, D5);
6868

6969

examples/SSD1306TwoScreenDemo/SSD1306TwoScreenDemo.ino

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,12 @@
3030
// Include the correct display library
3131
// For a connection via I2C using Wire include
3232
#include <Wire.h> // Only needed for Arduino 1.6.5 and earlier
33-
#include "SSD1306.h" // alias for `#include "SSD1306Wire.h"`
33+
#include "SSD1306Wire.h" // legacy include: `#include "SSD1306.h"`
3434
#include "images.h"
3535

3636
// Initialize the OLED display using Wire library
37-
SSD1306 display(0x3c, D3, D5);
38-
SSD1306 display2(0x3c, D1, D2);
37+
SSD1306Wire display(0x3c, D3, D5);
38+
SSD1306Wire display2(0x3c, D1, D2);
3939

4040
void setup() {
4141
Serial.begin(115200);
@@ -60,9 +60,6 @@ void setup() {
6060
display2.setFont(ArialMT_Plain_10);
6161
display2.setTextAlignment(TEXT_ALIGN_LEFT);
6262

63-
64-
65-
6663
}
6764

6865
void loop() {

examples/SSD1306UiDemo/SSD1306UiDemo.ino

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
// Include the correct display library
3232
// For a connection via I2C using Wire include
3333
#include <Wire.h> // Only needed for Arduino 1.6.5 and earlier
34-
#include "SSD1306.h" // alias for `#include "SSD1306Wire.h"`
35-
// or #include "SH1106.h" alis for `#include "SH1106Wire.h"`
34+
#include "SSD1306Wire.h" // legacy include: `#include "SSD1306.h"`
35+
// or #include "SH1106Wire.h", legacy include: `#include "SH1106.h"`
3636
// For a connection via I2C using brzo_i2c (must be installed) include
3737
// #include <brzo_i2c.h> // Only needed for Arduino 1.6.5 and earlier
3838
// #include "SSD1306Brzo.h"
@@ -69,8 +69,8 @@
6969
// SH1106Brzo display(0x3c, D3, D5);
7070

7171
// Initialize the OLED display using Wire library
72-
SSD1306 display(0x3c, D3, D5);
73-
// SH1106 display(0x3c, D3, D5);
72+
SSD1306Wire display(0x3c, D3, D5);
73+
// SH1106Wire display(0x3c, D3, D5);
7474

7575
OLEDDisplayUi ui ( &display );
7676

0 commit comments

Comments
 (0)