Skip to content

Commit d4c41c3

Browse files
committed
Reverted added override to avoid requiring C++11.
1 parent 1607dd7 commit d4c41c3

File tree

1 file changed

+10
-5
lines changed

1 file changed

+10
-5
lines changed

Adafruit_SSD1306.h

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,12 @@
2424
#ifndef _Adafruit_SSD1306_H_
2525
#define _Adafruit_SSD1306_H_
2626

27-
// ONE of the following four lines must be #defined:
27+
// ONE of the following lines must be #defined:
2828
//#define SSD1306_128_64 ///< DEPRECTAED: old way to specify 128x64 screen
2929
#define SSD1306_128_32 ///< DEPRECATED: old way to specify 128x32 screen
3030
//#define SSD1306_96_16 ///< DEPRECATED: old way to specify 96x16 screen
3131
//#define SSD1306_64_48 ///< DEPRECATED: old way to specify 64x48 screen
32+
//#define SSD1306_64_32 ///< DEPRECATED: old way to specify 64x32 screen
3233
// This establishes the screen dimensions in old Adafruit_SSD1306 sketches
3334
// (NEW CODE SHOULD IGNORE THIS, USE THE CONSTRUCTORS THAT ACCEPT WIDTH
3435
// AND HEIGHT ARGUMENTS).
@@ -125,6 +126,10 @@ typedef uint32_t PortMask;
125126
#define SSD1306_LCDWIDTH 64 ///< DEPRECATED: width w/SSD1306_64_48 defined
126127
#define SSD1306_LCDHEIGHT 48 ///< DEPRECATED: height w/SSD1306_64_48 defined
127128
#endif
129+
#if defined SSD1306_64_32
130+
#define SSD1306_LCDWIDTH 64 ///< DEPRECATED: width w/SSD1306_64_32 defined
131+
#define SSD1306_LCDHEIGHT 32 ///< DEPRECATED: height w/SSD1306_64_32 defined
132+
#endif
128133

129134
/*!
130135
@brief Class that stores state and functions for interacting with
@@ -153,11 +158,11 @@ class Adafruit_SSD1306 : public Adafruit_GFX {
153158
bool reset = true, bool periphBegin = true);
154159
void display(void);
155160
void clearDisplay(void);
156-
virtual void invertDisplay(bool i) override;
161+
virtual void invertDisplay(bool i);
157162
void dim(bool dim);
158-
virtual void drawPixel(int16_t x, int16_t y, uint16_t color) override;
159-
virtual void drawFastHLine(int16_t x, int16_t y, int16_t w, uint16_t color) override;
160-
virtual void drawFastVLine(int16_t x, int16_t y, int16_t h, uint16_t color) override;
163+
virtual void drawPixel(int16_t x, int16_t y, uint16_t color);
164+
virtual void drawFastHLine(int16_t x, int16_t y, int16_t w, uint16_t color);
165+
virtual void drawFastVLine(int16_t x, int16_t y, int16_t h, uint16_t color);
161166
void startscrollright(uint8_t start, uint8_t stop);
162167
void startscrollleft(uint8_t start, uint8_t stop);
163168
void startscrolldiagright(uint8_t start, uint8_t stop);

0 commit comments

Comments
 (0)