Merge pull request #183 from Rotzbua/improve_constructor

squix78 · web-flow · commit d5cada2ccfd3 · 2018-03-18T07:50:58.000+01:00
improve constructor
diff --git a/OLEDDisplay.cpp b/OLEDDisplay.cpp
@@ -714,6 +714,18 @@ size_t OLEDDisplay::write(const char* str) {
 }
 
 // Private functions
+void OLEDDisplay::setGeometry(OLEDDISPLAY_GEOMETRY g) {
+  this->geometry = g;
+  if (g == GEOMETRY_128_64) {
+    this->displayWidth                     = 128;
+    this->displayHeight                    = 64;
+  } else if (g == GEOMETRY_128_32) {
+    this->displayWidth                     = 128;
+    this->displayHeight                    = 32;
+  }
+  this->displayBufferSize                = displayWidth*displayHeight/8;
+}
+
 void OLEDDisplay::sendInitCommands(void) {
   sendCommand(DISPLAYOFF);
   sendCommand(SETDISPLAYCLOCKDIV);
@@ -854,4 +866,4 @@ char* OLEDDisplay::utf8ascii(String str) {
 
 void OLEDDisplay::setFontTableLookupFunction(FontTableLookupFunction function) {
   this->fontTableLookupFunction = function;
-}
+}
diff --git a/OLEDDisplay.h b/OLEDDisplay.h
@@ -265,6 +265,9 @@ class OLEDDisplay : public Print {
     uint16_t  displayWidth                     = 128;
     uint16_t  displayHeight                    = 64;
     uint16_t  displayBufferSize                = 1024;
+    
+    // Set the correct height, width and buffer for the geometry
+    void setGeometry(OLEDDISPLAY_GEOMETRY g);
 
     OLEDDISPLAY_TEXT_ALIGNMENT   textAlignment = TEXT_ALIGN_LEFT;
     OLEDDISPLAY_COLOR            color         = WHITE;
diff --git a/SH1106Brzo.h b/SH1106Brzo.h
@@ -44,21 +44,8 @@ class SH1106Brzo : public OLEDDisplay {
       uint8_t             _scl;
 
   public:
-    SH1106Brzo(uint8_t _address, uint8_t _sda, uint8_t _scl) : SH1106Brzo(GEOMETRY_128_64, _address, _sda, _scl) {
-
-    }
-
-    SH1106Brzo(OLEDDISPLAY_GEOMETRY g, uint8_t _address, uint8_t _sda, uint8_t _scl) {
-      this->geometry = g;
-      if (g == GEOMETRY_128_64) {
-        this->displayWidth                     = 128;
-        this->displayHeight                    = 64;
-        this->displayBufferSize                = 1024;
-      } else if (g == GEOMETRY_128_32) {
-        this->displayWidth                     = 128;
-        this->displayHeight                    = 32;
-        this->displayBufferSize                = 512;
-      }
+	SH1106Brzo(uint8_t _address, uint8_t _sda, uint8_t _scl, OLEDDISPLAY_GEOMETRY g = GEOMETRY_128_64) { 
+		setGeometry(g);
 
       this->_address = _address;
       this->_sda = _sda;
diff --git a/SH1106Spi.h b/SH1106Spi.h
@@ -37,21 +37,8 @@ class SH1106Spi : public OLEDDisplay {
       uint8_t             _dc;
 
   public:
-    SH1106Spi(uint8_t _rst, uint8_t _dc) : SH1106Spi(GEOMETRY_128_64, _rst, _dc) {
-
-    }
-
-    SH1106Spi(OLEDDISPLAY_GEOMETRY g, uint8_t _rst, uint8_t _dc) {
-      this->geometry = g;
-      if (g == GEOMETRY_128_64) {
-        this->displayWidth                     = 128;
-        this->displayHeight                    = 64;
-        this->displayBufferSize                = 1024;
-      } else if (g == GEOMETRY_128_32) {
-        this->displayWidth                     = 128;
-        this->displayHeight                    = 32;
-        this->displayBufferSize                = 512;
-      }
+    SH1106Spi(uint8_t _rst, uint8_t _dc, uint8_t _cs, OLEDDISPLAY_GEOMETRY g = GEOMETRY_128_64) {
+        setGeometry(g);
 
       this->_rst = _rst;
       this->_dc  = _dc;
diff --git a/SH1106Wire.h b/SH1106Wire.h
@@ -44,21 +44,8 @@ class SH1106Wire : public OLEDDisplay {
       uint8_t             _scl;
 
   public:
-    SH1106Wire(uint8_t _address, uint8_t _sda, uint8_t _scl) : SH1106Wire(GEOMETRY_128_64, _address, _sda, _scl) {
-
-    }
-
-    SH1106Wire(OLEDDISPLAY_GEOMETRY g, uint8_t _address, uint8_t _sda, uint8_t _scl) {
-      this->geometry = g;
-      if (g == GEOMETRY_128_64) {
-        this->displayWidth                     = 128;
-        this->displayHeight                    = 64;
-        this->displayBufferSize                = 1024;
-      } else if (g == GEOMETRY_128_32) {
-        this->displayWidth                     = 128;
-        this->displayHeight                    = 32;
-        this->displayBufferSize                = 512;
-      }
+    SH1106Wire(uint8_t _address, uint8_t _sda, uint8_t _scl, OLEDDISPLAY_GEOMETRY g = GEOMETRY_128_64) {
+      setGeometry(g);
 
       this->_address = _address;
       this->_sda = _sda;
diff --git a/SSD1306Brzo.h b/SSD1306Brzo.h
@@ -44,21 +44,8 @@ class SSD1306Brzo : public OLEDDisplay {
       uint8_t             _scl;
 
   public:
-    SSD1306Brzo(uint8_t _address, uint8_t _sda, uint8_t _scl) : SSD1306Brzo(GEOMETRY_128_64, _address, _sda, _scl) {
-
-    }
-
-    SSD1306Brzo(OLEDDISPLAY_GEOMETRY g, uint8_t _address, uint8_t _sda, uint8_t _scl) {
-      this->geometry = g;
-      if (g == GEOMETRY_128_64) {
-        this->displayWidth                     = 128;
-        this->displayHeight                    = 64;
-        this->displayBufferSize                = 1024;
-      } else if (g == GEOMETRY_128_32) {
-        this->displayWidth                     = 128;
-        this->displayHeight                    = 32;
-        this->displayBufferSize                = 512;
-      }
+    SSD1306Brzo(uint8_t _address, uint8_t _sda, uint8_t _scl, OLEDDISPLAY_GEOMETRY g = GEOMETRY_128_64) {
+      setGeometry(g);
 
       this->_address = _address;
       this->_sda = _sda;
diff --git a/SSD1306Spi.h b/SSD1306Spi.h
@@ -44,21 +44,8 @@ class SSD1306Spi : public OLEDDisplay {
       uint8_t             _cs;
 
   public:
-    SSD1306Spi(uint8_t _rst, uint8_t _dc, uint8_t _cs) : SSD1306Spi(GEOMETRY_128_64, _rst, _dc, _cs) {
-
-    }
-
-    SSD1306Spi(OLEDDISPLAY_GEOMETRY g,  uint8_t _rst, uint8_t _dc, uint8_t _cs) {
-      this->geometry = g;
-      if (g == GEOMETRY_128_64) {
-        this->displayWidth                     = 128;
-        this->displayHeight                    = 64;
-        this->displayBufferSize                = 1024;
-      } else if (g == GEOMETRY_128_32) {
-        this->displayWidth                     = 128;
-        this->displayHeight                    = 32;
-        this->displayBufferSize                = 512;
-      }
+    SSD1306Spi(uint8_t _rst, uint8_t _dc, uint8_t _cs, OLEDDISPLAY_GEOMETRY g = GEOMETRY_128_64) {
+        setGeometry(g);
 
       this->_rst = _rst;
       this->_dc  = _dc;
diff --git a/SSD1306Wire.h b/SSD1306Wire.h
@@ -39,21 +39,8 @@ class SSD1306Wire : public OLEDDisplay {
       bool                _doI2cAutoInit = false;
 
   public:
-    SSD1306Wire(uint8_t _address, uint8_t _sda, uint8_t _scl) : SSD1306Wire(GEOMETRY_128_64, _address, _sda, _scl) {
-
-    }
-
-    SSD1306Wire(OLEDDISPLAY_GEOMETRY g, uint8_t _address, uint8_t _sda, uint8_t _scl) {
-      this->geometry = g;
-      if (g == GEOMETRY_128_64) {
-        this->displayWidth                     = 128;
-        this->displayHeight                    = 64;
-        this->displayBufferSize                = 1024;
-      } else if (g == GEOMETRY_128_32) {
-        this->displayWidth                     = 128;
-        this->displayHeight                    = 32;
-        this->displayBufferSize                = 512;
-      }
+    SSD1306Wire(uint8_t _address, uint8_t _sda, uint8_t _scl, OLEDDISPLAY_GEOMETRY g = GEOMETRY_128_64) {
+      setGeometry(g);
 
       this->_address = _address;
       this->_sda = _sda;
diff --git a/examples/SSD1306ClockDemo/SSD1306ClockDemo.ino b/examples/SSD1306ClockDemo/SSD1306ClockDemo.ino
@@ -66,7 +66,7 @@
 // SH1106Brzo  display(0x3c, D3, D5);
 
 // Initialize the OLED display using Wire library
-SSD1306  display(GEOMETRY_128_64, 0x3c, D3, D5);
+SSD1306  display(0x3c, D3, D5);
 // SH1106 display(0x3c, D3, D5);
 
 OLEDDisplayUi ui ( &display );
diff --git a/examples/SSD1306DrawingDemo/SSD1306DrawingDemo.ino b/examples/SSD1306DrawingDemo/SSD1306DrawingDemo.ino
@@ -58,7 +58,7 @@
  // SH1106Brzo  display(0x3c, D3, D5);
 
  // Initialize the OLED display using Wire library
- SSD1306  display(GEOMETRY_128_64, 0x3c, D3, D5);
+ SSD1306  display(0x3c, D3, D5);
  // SH1106 display(0x3c, D3, D5);
 
 // Adapted from Adafruit_SSD1306
diff --git a/examples/SSD1306OTADemo/SSD1306OTADemo.ino b/examples/SSD1306OTADemo/SSD1306OTADemo.ino
@@ -69,7 +69,7 @@
 // SH1106Brzo  display(0x3c, D3, D5);
 
 // Initialize the OLED display using Wire library
-SSD1306  display(GEOMETRY_128_64, 0x3c, D3, D5);
+SSD1306  display(0x3c, D3, D5);
 // SH1106 display(0x3c, D3, D5);
 
 
diff --git a/examples/SSD1306SimpleDemo/SSD1306SimpleDemo.ino b/examples/SSD1306SimpleDemo/SSD1306SimpleDemo.ino
@@ -58,7 +58,7 @@
 // SH1106Brzo  display(0x3c, D3, D5);
 
 // Initialize the OLED display using Wire library
-SSD1306  display(GEOMETRY_128_64, 0x3c, D3, D5);
+SSD1306  display(0x3c, D3, D5);
 // SH1106 display(0x3c, D3, D5);
 
 
diff --git a/examples/SSD1306TwoScreenDemo/SSD1306TwoScreenDemo.ino b/examples/SSD1306TwoScreenDemo/SSD1306TwoScreenDemo.ino
@@ -34,8 +34,8 @@
 #include "images.h"
 
 // Initialize the OLED display using Wire library
-SSD1306  display(GEOMETRY_128_64, 0x3c, D3, D5);
-SSD1306  display2(GEOMETRY_128_64, 0x3c, D1, D2);
+SSD1306  display(0x3c, D3, D5);
+SSD1306  display2(0x3c, D1, D2);
 
 
 #define DEMO_DURATION 3000
diff --git a/examples/SSD1306UiDemo/SSD1306UiDemo.ino b/examples/SSD1306UiDemo/SSD1306UiDemo.ino
@@ -64,7 +64,7 @@
 // SH1106Brzo  display(0x3c, D3, D5);
 
 // Initialize the OLED display using Wire library
-SSD1306  display(GEOMETRY_128_64, 0x3c, D3, D5);
+SSD1306  display(0x3c, D3, D5);
 // SH1106 display(0x3c, D3, D5);
 
 OLEDDisplayUi ui     ( &display );
