New support for the common SSD1306 I2C Displays

sensate-io · May 18, 2020 · 4ab0af1 · 4ab0af1
1 parent 40d4479
commit 4ab0af1
Show file tree

Hide file tree

Showing 11 changed files with 38 additions and 161 deletions.
diff --git a/firmware-esp8266.ino b/firmware-esp8266.ino
@@ -16,14 +16,14 @@
 /**************************************************************************/
 
 #include "src/controller/Bridge.h"
-#include "src/output/display/DisplaySSD1306.h"
+#include "src/output/display/DisplayOLED128.h"
 #include "src/communication/WiFiManager.h"
 #include "src/controller/OTA.h"
 #include "src/communication/RestServer.h"
 
 Display* display = NULL;
 
-int currentVersion = 29; 
+int currentVersion = 30; 
 boolean printMemory = false;
 
 String board = "Generic";
@@ -101,7 +101,9 @@ void setup()
   if(displayType!=0)
   {
     boolean rotateDisplay = (displayRotation == 180);
-    display = new Display(rotateDisplay, "","",i2cSDAPort,i2cSCLPort);
+
+    display = new Display(rotateDisplay, displayType,"",i2cSDAPort,i2cSCLPort);
+
     if(!displayEnabled)
       display->clear(true);
   }

diff --git a/src/communication/RestServer.h b/src/communication/RestServer.h
@@ -24,7 +24,7 @@
 
 #include "../controller/StateHelper.h"
 #include "../controller/UUID.h"
-#include "../output/display/DisplaySSD1306.h"
+#include "../output/display/DisplayOLED128.h"
 #include "../communication/WiFiManager.h"
 
 void startRestServer();

diff --git a/src/communication/WiFiManager.cpp b/src/communication/WiFiManager.cpp
@@ -16,7 +16,6 @@
 /**************************************************************************/
 
 #include "WiFiManager.h"
-#include "Hash.h"
 
 extern State state;
 extern Display* display;

diff --git a/src/communication/WiFiManager.h b/src/communication/WiFiManager.h
@@ -22,11 +22,12 @@
 #include <ESP8266WebServer.h>
 #include <ESP8266mDNS.h>
 #include <ArduinoJson.h>
+#include "Hash.h"
 
 #ifndef _WiFiManager_h_
 #define _WiFiManager_h_
 
-#include "../output/display/DisplaySSD1306.h"
+#include "../output/display/DisplayOLED128.h"
 #include "../controller/StateHelper.h"
 #include "../controller/Bridge.h"
 

diff --git a/src/controller/Bridge.cpp b/src/controller/Bridge.cpp
@@ -449,11 +449,11 @@ void configureBridge(JsonObject& bridgeConfig) {
     displayEnabled = false;
   }
 
-  if(displayType!=0 && (oldSCL != i2cSCLPort || oldSDA != i2cSDAPort || oldDisplayWidth != displayWidth || oldDisplayHeight != displayHeight))
+  if(displayType!=0 && (oldSCL != i2cSCLPort || oldSDA != i2cSDAPort || oldDisplayWidth != displayWidth || oldDisplayHeight != displayHeight) || (display!=NULL && display->getType()!=displayType))
   {
     Serial.println("CREATE TEMP DISPLAY for new I2C Bus!");
     boolean rotateDisplay = (displayRotation == 180);
-    display = new Display(rotateDisplay, "","",i2cSDAPort,i2cSCLPort);
+    display = new Display(rotateDisplay, displayType,"",i2cSDAPort,i2cSCLPort);
   }
   else
   {
@@ -465,7 +465,7 @@ void configureBridge(JsonObject& bridgeConfig) {
     {
       Serial.println("CREATE TEMP DISPLAY!");
       boolean rotateDisplay = (displayRotation == 180);
-      display = new Display(rotateDisplay, "","",i2cSDAPort,i2cSCLPort);
+      display = new Display(rotateDisplay, displayType,"",i2cSDAPort,i2cSCLPort);
     }
     else if(updateRotation && display!=NULL)
     {
@@ -980,7 +980,7 @@ boolean postSensorData(Data* data[], int dataCount)
         displayEnabled=true;
         boolean rotateDisplay = (displayRotation == 180);
         if(display==NULL)
-          display = new Display(rotateDisplay, "","",i2cSDAPort,i2cSCLPort);
+          display = new Display(rotateDisplay, displayType,"",i2cSDAPort,i2cSCLPort);
         storeDisplayAndPowerConfig(false);
       }
       else if(payload.equals("dd") && displayEnabled==true)

diff --git a/src/controller/Bridge.h b/src/controller/Bridge.h
@@ -33,7 +33,7 @@
 #include "../input/i2c/SensorBH1750.h"
 #include "../input/onewire/SensorDHT.h"
 #include "../input/onewire/SensorDallas.h"
-#include "../output/display/DisplaySSD1306.h"
+#include "../output/display/DisplayOLED128.h"
 
 bool registerBridge();
 void restoreBridgeConfig();

diff --git a/src/controller/OTA.cpp b/src/controller/OTA.cpp
@@ -16,8 +16,6 @@
 /**************************************************************************/
 
 #include "OTA.h"
-#include "StateHelper.h"
-#include "../output/display/DisplaySSD1306.h"
 
 extern State state;
 extern Display* display;

diff --git a/src/controller/OTA.h b/src/controller/OTA.h
@@ -16,6 +16,8 @@
 /**************************************************************************/
 
 #include <ESP8266httpUpdate.h>
+#include "StateHelper.h"
+#include "../output/display/DisplayOLED128.h"
 
 #ifndef _OTA_h_
 #define _OTA_h_

diff --git a/src/input/SensorCalculation.h b/src/input/SensorCalculation.h
@@ -22,7 +22,7 @@
 #define __SensorCalculation_h_
 
 #include "../communication/Data.h"
-#include "../output/display/DisplaySSD1306.h"
+#include "../output/display/DisplayOLED128.h"
 
 class SensorCalculation {
   protected:

diff --git a/src/output/display/DisplaySSD1306.cpp → src/output/display/DisplayOLED128.cpp b/src/output/display/DisplaySSD1306.cpp → src/output/display/DisplayOLED128.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*!
-    @file     DisplaySSD1306.cpp
+    @file     DisplayOLED128.cpp
     @author   M. Fegerl (Sensate Digital Technologies GmbH)
     @license  GPL (see LICENSE file)
     The Sensate ESP8266 firmware is used to connect ESP8266 based hardware 
@@ -15,7 +15,7 @@
 */
 /**************************************************************************/
 
-#include "DisplaySSD1306.h"
+#include "DisplayOLED128.h"
 
 extern bool isResetting;
 
@@ -27,7 +27,7 @@ int displayWidth;
 int displayRotation;
 bool firstSensorData;
 
-Display::Display(bool flip, String type, String address, uint8_t PortSDA, uint8_t PortSCL) {
+Display::Display(bool flip, int _type, String address, uint8_t PortSDA, uint8_t PortSCL) {
 
   if(!isResetting)
   {
@@ -40,8 +40,12 @@ Display::Display(bool flip, String type, String address, uint8_t PortSDA, uint8_
 
     firstSensorData=true;
 
-    display = new SH1106Wire(0x3c, PortSDA, PortSCL, g);
-
+    type = _type;
+    if(_type==2)
+      display = new SSD1306Wire(0x3c, PortSDA, PortSCL, g);
+    else
+      display = new SH1106Wire(0x3c, PortSDA, PortSCL, g);
+
     display->init();
     if(flip)
       display->flipScreenVertically();
@@ -71,6 +75,11 @@ void Display::flip(int rotation) {
     display->resetOrientation();
 }
 
+int Display::getType()
+{
+  return type;
+}
+
 void Display::drawProductLogo() {
 
     // see http://blog.squix.org/2015/05/esp8266-nodemcu-how-to-create-xbm.html
@@ -247,140 +256,4 @@ void Display::drawValueQuad(int position, String name, String shortName, float v
     display->display();
   }
 
-}
-
-//void drawLines() {
-//  for (int16_t i=0; i<display.getWidth(); i+=4) {
-//    display.drawLine(0, 0, i, display.getHeight()-1);
-//    display.display();
-//    delay(10);
-//  }
-//  for (int16_t i=0; i<display.getHeight(); i+=4) {
-//    display.drawLine(0, 0, display.getWidth()-1, i);
-//    display.display();
-//    delay(10);
-//  }
-//  delay(250);
-//
-//  display.clear();
-//  for (int16_t i=0; i<display.getWidth(); i+=4) {
-//    display.drawLine(0, display.getHeight()-1, i, 0);
-//    display.display();
-//    delay(10);
-//  }
-//  for (int16_t i=display.getHeight()-1; i>=0; i-=4) {
-//    display.drawLine(0, display.getHeight()-1, display.getWidth()-1, i);
-//    display.display();
-//    delay(10);
-//  }
-//  delay(250);
-//
-//  display.clear();
-//  for (int16_t i=display.getWidth()-1; i>=0; i-=4) {
-//    display.drawLine(display.getWidth()-1, display.getHeight()-1, i, 0);
-//    display.display();
-//    delay(10);
-//  }
-//  for (int16_t i=display.getHeight()-1; i>=0; i-=4) {
-//    display.drawLine(display.getWidth()-1, display.getHeight()-1, 0, i);
-//    display.display();
-//    delay(10);
-//  }
-//  delay(250);
-//  display.clear();
-//  for (int16_t i=0; i<display.getHeight(); i+=4) {
-//    display.drawLine(display.getWidth()-1, 0, 0, i);
-//    display.display();
-//    delay(10);
-//  }
-//  for (int16_t i=0; i<display.getWidth(); i+=4) {
-//    display.drawLine(display.getWidth()-1, 0, i, display.getHeight()-1);
-//    display.display();
-//    delay(10);
-//  }
-//  delay(250);
-//}
-//
-//// Adapted from Adafruit_SSD1306
-//void drawRect(void) {
-//  for (int16_t i=0; i<display.getHeight()/2; i+=2) {
-//    display.drawRect(i, i, display.getWidth()-2*i, display.getHeight()-2*i);
-//    display.display();
-//    delay(10);
-//  }
-//}
-//
-//// Adapted from Adafruit_SSD1306
-//void fillRect(void) {
-//  uint8_t color = 1;
-//  for (int16_t i=0; i<display.getHeight()/2; i+=3) {
-//    display.setColor((color % 2 == 0) ? BLACK : WHITE); // alternate colors
-//    display.fillRect(i, i, display.getWidth() - i*2, display.getHeight() - i*2);
-//    display.display();
-//    delay(10);
-//    color++;
-//  }
-//  // Reset back to WHITE
-//  display.setColor(WHITE);
-//}
-//
-//// Adapted from Adafruit_SSD1306
-//void drawCircle(void) {
-//  for (int16_t i=0; i<display.getHeight(); i+=2) {
-//    display.drawCircle(display.getWidth()/2, display.getHeight()/2, i);
-//    display.display();
-//    delay(10);
-//  }
-//  delay(1000);
-//  display.clear();
-//
-//  // This will draw the part of the circel in quadrant 1
-//  // Quadrants are numberd like this:
-//  //   0010 | 0001
-//  //  ------|-----
-//  //   0100 | 1000
-//  //
-//  display.drawCircleQuads(display.getWidth()/2, display.getHeight()/2, display.getHeight()/4, 0b00000001);
-//  display.display();
-//  delay(200);
-//  display.drawCircleQuads(display.getWidth()/2, display.getHeight()/2, display.getHeight()/4, 0b00000011);
-//  display.display();
-//  delay(200);
-//  display.drawCircleQuads(display.getWidth()/2, display.getHeight()/2, display.getHeight()/4, 0b00000111);
-//  display.display();
-//  delay(200);
-//  display.drawCircleQuads(display.getWidth()/2, display.getHeight()/2, display.getHeight()/4, 0b00001111);
-//  display.display();
-//}
-//
-//void printBuffer(void) {
-//  // Initialize the log buffer
-//  // allocate memory to store 8 lines of text and 30 chars per line.
-//  display.setLogBuffer(5, 30);
-//
-//  // Some test data
-//  const char* test[] = {
-//      "Hello",
-//      "World" ,
-//      "----",
-//      "Show off",
-//      "how",
-//      "the log buffer",
-//      "is",
-//      "working.",
-//      "Even",
-//      "scrolling is",
-//      "working"
-//  };
-//
-//  for (uint8_t i = 0; i < 11; i++) {
-//    display.clear();
-//    // Print to the screen
-//    display.println(test[i]);
-//    // Draw it to the internal screen buffer
-//    display.drawLogBuffer(0, 0);
-//    // Display it on the screen
-//    display.display();
-//    delay(500);
-//  }
-//}
+}
diff --git a/src/output/display/DisplaySSD1306.h → src/output/display/DisplayOLED128.h b/src/output/display/DisplaySSD1306.h → src/output/display/DisplayOLED128.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*!
-    @file     DisplaySSD1306.h
+    @file     DisplayOLED128.h
     @author   M. Fegerl (Sensate Digital Technologies GmbH)
     @license  GPL (see LICENSE file)
     The Sensate ESP8266 firmware is used to connect ESP8266 based hardware 
@@ -18,8 +18,8 @@
 #include "SSD1306Wire.h" 
 #include "SH1106Wire.h"
 
-#ifndef _DisplaySSD1306_h_
-#define _DisplaySSD1306_h_
+#ifndef _DisplayOLED128_h_
+#define _DisplayOLED128_h_
 
 #define Product_Logo_width 128
 #define Product_Logo_height 64
@@ -113,9 +113,10 @@ const uint8_t Product_Logo[] PROGMEM = {
 
 class Display {
   private:
-    SH1106Wire *display;
+    OLEDDisplay *display;
+    int type;
   public:
-    Display (bool, String, String, uint8_t, uint8_t);
+    Display (bool, int, String, uint8_t, uint8_t);
     void drawProductLogo();
     void clear(boolean update);
     void drawString(int16_t x, int16_t y, String text);
@@ -127,6 +128,7 @@ class Display {
     void drawValue(int position, String name, String shortName, float value, String unit);
     void drawValueClassic(int position, String name, String shortName, float value, String uit);
     void drawValueQuad(int position, String name, String shortName, float value, String unit);
+    int getType();
 };
 
 #endif