Added Support for ST7735 Displays, and added new Display Mode (Right Alligned Classic Mode)

Author: Manuel-Sensate

Sensatio_FW_ESP32.cpp

@@ -11,7 +11,7 @@
     SOURCE: https://github.com/sensate-io/firmware-esp32.git
 
     @section  HISTORY
-    v41 - Changed IDE, Sensatio
+    v41 - Changed IDE, Sensatio, Renamed Display Class to support more types
     v40 - New Display Structure to enable Display Rotation, different Styles etc.
     v39 - Changed automatic Update to only if required Update (skipping versions to be on par with ESP8266)
     v35 - Added Support for VEML6075 and SI1145 UVI Sensors
@@ -24,20 +24,20 @@
 VisualisationHelper* vHelper;
 Display* display = NULL;
 
-int currentVersion = 40;
+int currentVersion = 41;
 boolean printMemory = false;
 
-String board = "Generic";
-char firmwareType[] = "ESP32";
+//String board = "Generic";
+//char firmwareType[] = "ESP32";
 
 // String board = "DevKitC";
 // char firmwareType[] = "ESP32-DevKitC";
 
 // String board = "ESP32S";
 // char firmwareType[] = "ESP32-S";
 
-// String board = "ESP-WROOM-32";
-// char firmwareType[] = "ESP32-WROOM";
+ String board = "ESP-WROOM-32";
+ char firmwareType[] = "ESP32-WROOM";
 
 // String board = "M5StickC";
 // char firmwareType[] = "ESP32-M5StickC";
@@ -61,12 +61,15 @@ unsigned long previousTickerMillis = 0;
 unsigned long currentMillis;
 State state = Boot;
 
-esp_sleep_wakeup_cause_t resetInfo;
+int displayMode;
+boolean displayEnabled;
+int displayType;
+int displayHeight;
+int displayWidth;
+int displayRotation;
+bool firstSensorData;
 
-extern int displayType;
-extern boolean displayEnabled;
-extern int displayRotation;
-extern int displayMode;
+esp_sleep_wakeup_cause_t resetInfo;
 
 extern uint8_t i2cSDAPort;
 extern uint8_t i2cSCLPort;
@@ -108,7 +111,15 @@ void setup()
   {
     boolean rotateDisplay = (displayRotation == 180);
 
-    display = new Display(rotateDisplay, displayType,"",i2cSDAPort,i2cSCLPort);
+    switch(displayType)
+	{
+		case 3:
+			display = new DisplayST7735(rotateDisplay, displayType);
+			break;
+		default:	// Fallback to OLED init
+			display = new DisplayOLED128(displayWidth, displayHeight, rotateDisplay, displayType,"",i2cSDAPort,i2cSCLPort);
+			break;
+	}
 
     if(!displayEnabled)
       display->clear(true);

Sensatio_FW_ESP32.h

@@ -11,7 +11,7 @@
     SOURCE: https://github.com/sensate-io/firmware-esp32.git
 
     @section  HISTORY
-    v41 - Changed IDE, Sensatio
+    v41 - Changed IDE, Sensatio, Renamed Display Class to support more types
 */
 /**************************************************************************/
 
@@ -27,7 +27,7 @@
 
 //add your includes for the project Sensatio_FW_ESP32 here
 #include "src/controller/Bridge.h"
-#include "src/output/display/DisplayOLED128.h"
+#include "src/output/display/Display.h"
 #include "src/communication/WiFiManager.h"
 #include "src/controller/OTA.h"
 #include "src/communication/RestServer.h"

src/communication/RestServer.cpp

@@ -3,10 +3,10 @@
     @file     RestServer.cpp
     @author   M. Fegerl (Sensate Digital Solutions GmbH)
     @license  GPL (see LICENSE file)
-    The Sensate ESP32 firmware is used to connect ESP32 based hardware 
-    with the Sensate Cloud and the Sensate apps.
+    The Sensatio ESP32 firmware is used to connect ESP32 based hardware
+    with the Sensatio Cloud and the Sensatio apps.
 
-    ----> https://www.sensate.io
+    ----> https://www.sensatio.io
 
     SOURCE: https://github.com/sensate-io/firmware-esp8266.git
 
@@ -21,11 +21,8 @@ WebServer http_rest_server(80);
 
 extern State state;
 extern IPAddress apIP;
-extern IPAddress netMsk;
-extern const byte DNS_PORT;
 extern const char *myHostname;
 extern Display* display;
-extern String bridgeURL;
 extern MQTT* mqtt;
 extern boolean enableMQTT;
 
@@ -339,9 +336,9 @@ void returnNetworkList() {
   for (int i = 0; i < numberOfNetworks; i++) {
 
     JsonObject& network = jsonBuffer.createObject();
-    network["name"] = WiFi.SSID(i);
+    network["name"] = WiFi.SSID(i); // @suppress("Invalid arguments")
     network["enc"] =  (WiFi.encryptionType(i) == WIFI_AUTH_OPEN) ? false : true;
-    network["rssi"] = WiFi.RSSI(i);
+    network["rssi"] = WiFi.RSSI(i); // @suppress("Invalid arguments")
 
     root.add(network);
   }
@@ -365,15 +362,15 @@ void presentWiFiSetupScreen() {
 
   for (int i = 0; i < numberOfNetworks; i++) {
 
-    networks[i] = WiFi.SSID(i) + " (" + WiFi.RSSI(i) + "ddBm)";
+    networks[i] = WiFi.SSID(i) + " (" + WiFi.RSSI(i) + "ddBm)"; // @suppress("Invalid arguments")
 //    Serial.println("Network: " + networks[i]);
 
   }
 
   restoreBridgeConfig();
   String wifiResponse = "<html><body style='width:600;margin-left:auto;margin-right:auto;font-family:verdana'><br/><br/><h1>Welcome to your Sensate Bridge</h1><br/><br/><form action='/manualsetup' method='post'><table width='100%'><tr><td colspan='2'><h2>Wireless LAN Configuration</h2></td></tr><tr><td align='right'><b>SSID/Name</b></td><td><select name='ssid'>";
   for (int i = 0; i < numberOfNetworks; i++) {
-    wifiResponse = wifiResponse + "<option value='" + WiFi.SSID(i) + "'>" + WiFi.SSID(i) + " (" + WiFi.RSSI(i) + "ddBm)</option>";
+    wifiResponse = wifiResponse + "<option value='" + WiFi.SSID(i) + "'>" + WiFi.SSID(i) + " (" + WiFi.RSSI(i) + "ddBm)</option>"; // @suppress("Invalid arguments")
   }
 
   wifiResponse = wifiResponse + "</select></td></tr><tr><td align='right'><b>Password</b></td><td><input type='password' name='password' value='' maxlength='63' placeholder='leave empty if unencrypted' size='30'/></td></tr><tr><td colspan='2'>&nbsp;</td></tr><tr><td colspan='2'><h2>Service Configuration</h2></td></tr><tr><td align='right'><b>SensorHub Location</b></td><td><input type='text' name='url' value='https://hub.sensate.cloud' maxlength='100' placeholder='Service Backend URL' size='40'/></td></tr><tr><td align='right'><b>Device Name</b></td><td><input type='text' name='identifier' value='Bridge' maxlength='100' placeholder='Bridge Name' size='40'/></td></tr><tr><td colspan='2'>&nbsp;</td></tr><tr><td colspan='2'>&nbsp;</td></tr><tr><td colspan='2' align='center'><input type='submit' value='Save and restart' style='height: 25px; width: 100px;'/></td></tr></table></form></body></html>";
@@ -426,4 +423,4 @@ bool isIp(String str) {
     }
   }
   return true;
-}
+}

src/communication/RestServer.h

@@ -3,10 +3,10 @@
     @file     RestServer.h
     @author   M. Fegerl (Sensate Digital Solutions GmbH)
     @license  GPL (see LICENSE file)
-    The Sensate ESP32 firmware is used to connect ESP32 based hardware 
-    with the Sensate Cloud and the Sensate apps.
+    The Sensatio ESP32 firmware is used to connect ESP32 based hardware
+    with the Sensatio Cloud and the Sensatio apps.
 
-    ----> https://www.sensate.io
+    ----> https://www.sensatio.io
 
     SOURCE: https://github.com/sensate-io/firmware-esp8266.git
 
@@ -24,7 +24,7 @@
 
 #include "../controller/StateHelper.h"
 #include "../controller/UUID.h"
-#include "../output/display/DisplayOLED128.h"
+#include "../output/display/Display.h"
 #include "../communication/WiFiManager.h"
 #include "MQTT.h"
 
@@ -48,4 +48,4 @@ void initMqtt();
 String toStringIp(IPAddress ip);
 bool isIp(String str);
 
-#endif
+#endif

src/communication/WiFiManager.cpp

@@ -3,14 +3,15 @@
     @file     WiFiManager.cpp
     @author   M. Fegerl (Sensate Digital Solutions GmbH)
     @license  GPL (see LICENSE file)
-    The Sensate ESP32 firmware is used to connect ESP32 based hardware 
-    with the Sensate Cloud and the Sensate apps.
+    The Sensatio ESP32 firmware is used to connect ESP32 based hardware
+    with the Sensatio Cloud and the Sensatio apps.
 
-    ----> https://www.sensate.io
+    ----> https://www.sensatio.io
 
     SOURCE: https://github.com/sensate-io/firmware-esp8266.git
 
     @section  HISTORY
+    v41 - Renamed Display Class to support more types
     v34 - First Public Release (Feature parity with ESP8266 Release v34)
 */
 /**************************************************************************/
@@ -427,4 +428,4 @@ void loopDNS() {
 
   dnsServer.processNextRequest(); 
 
-}
+}

src/communication/WiFiManager.h

@@ -26,7 +26,7 @@
 #ifndef _WiFiManager_h_
 #define _WiFiManager_h_
 
-#include "../output/display/DisplayOLED128.h"
+#include "../output/display/Display.h"
 #include "../controller/StateHelper.h"
 #include "../controller/Bridge.h"
 
@@ -41,4 +41,4 @@ void startDNS();
 void loopDNS();
 void checkWiFiStatus();
 
-#endif
+#endif

src/controller/Bridge.cpp

@@ -3,14 +3,15 @@
     @file     Bridge.cpp
     @author   M. Fegerl (Sensate Digital Solutions GmbH)
     @license  GPL (see LICENSE file)
-    The Sensate ESP32 firmware is used to connect ESP32 based hardware 
-    with the Sensate Cloud and the Sensate apps.
+    The Sensatio ESP32 firmware is used to connect ESP32 based hardware
+    with the Sensatio Cloud and the Sensatio apps.
 
-    ----> https://www.sensate.io
+    ----> https://www.sensatio.io
 
     SOURCE: https://github.com/sensate-io/firmware-esp8266.git
 
     @section  HISTORY
+    v41 - Renamed Display Class to support more types
     v40 - New Display Structure to enable Display Rotation, different Styles etc.
     v35 - Added Support for VEML6075 and SI1145 UVI Sensors
     v34 - First Public Release (Feature parity with ESP8266 Release v34)
@@ -517,11 +518,23 @@ void configureBridge(JsonObject& bridgeConfig) {
     displayEnabled = false;
   }
 
-  if((displayType!=0) && (((oldSCL != i2cSCLPort) || (oldSDA != i2cSDAPort) || (oldDisplayWidth != displayWidth) || (oldDisplayHeight != displayHeight)) || ((display!=NULL) && (display->getType()!=displayType))))
+  boolean requireInitI2C = true;
+
+  if(((displayType==1 || displayType==2)) && (((oldSCL != i2cSCLPort) || (oldSDA != i2cSDAPort) || (oldDisplayWidth != displayWidth) || (oldDisplayHeight != displayHeight)) || ((display!=NULL) && (display->getType()!=displayType))))
   {
-    Serial.println("CREATE TEMP DISPLAY for new I2C Bus!");
+    Serial.println("CREATE TEMP DISPLAY FOR NEW CONFIG");
     boolean rotateDisplay = (displayRotation == 180);
-    display = new Display(rotateDisplay, displayType,"",i2cSDAPort,i2cSCLPort);
+
+    switch(displayType)
+	{
+		case 3:
+			display = new DisplayST7735(rotateDisplay, displayType);
+			break;
+		default:	// Fallback to OLED init
+			display = new DisplayOLED128(displayWidth, displayHeight, rotateDisplay, displayType,"",i2cSDAPort,i2cSCLPort);
+			requireInitI2C=false;
+			break;
+	}
   }
   else
   {
@@ -531,21 +544,32 @@ void configureBridge(JsonObject& bridgeConfig) {
     }
     else if(display==NULL && displayType!=0)
     {
-      Serial.println("CREATE TEMP DISPLAY!");
-      boolean rotateDisplay = (displayRotation == 180);
-      display = new Display(rotateDisplay, displayType,"",i2cSDAPort,i2cSCLPort);
+		Serial.println("CREATE TEMP DISPLAY!");
+		boolean rotateDisplay = (displayRotation == 180);
+		switch(displayType)
+		{
+			case 3:
+				display = new DisplayST7735(rotateDisplay, displayType);
+				break;
+			default:	// Fallback to OLED init
+				display = new DisplayOLED128(displayWidth, displayHeight, rotateDisplay, displayType,"",i2cSDAPort,i2cSCLPort);
+				requireInitI2C=false;
+				break;
+		}
     }
     else if(updateRotation && display!=NULL)
     {
       Serial.println("FLIP!");
       display->flip(displayRotation);
     }
-    else if(displayType==0)
+  }
+
+  if(requireInitI2C)
     {
-      Serial.println("Init I2C Bus: SDA-"+String(i2cSDAPort)+", SCL-"+String(i2cSCLPort));
-      Wire.begin(i2cSDAPort, i2cSCLPort);
+  	  Serial.println("Init I2C Bus: SDA-"+String(i2cSDAPort)+", SCL-"+String(i2cSCLPort));
+  	  Wire.begin(i2cSDAPort, i2cSCLPort);
     }
-  }
+
 
   tryInitMQTT();
 
@@ -556,13 +580,6 @@ void configureBridge(JsonObject& bridgeConfig) {
 
 void initVisualisationHelper(JsonObject& bridgeConfig) {
 
-  int simultanValueCount;
-
-  if(displayHeight==64)
-    simultanValueCount = 4;
-  else if(displayHeight==32)
-    simultanValueCount = 2;
-
   unsigned long displayCycleInterval = bridgeConfig["di"];
 
   if(displayCycleInterval==0)
@@ -571,7 +588,7 @@ void initVisualisationHelper(JsonObject& bridgeConfig) {
   }
   else
   {
-    vHelper->enableDisplayCycle(millis(), simultanValueCount, displayCycleInterval);
+    vHelper->enableDisplayCycle(millis(), display->getSimultanValueCount(), displayCycleInterval);
   }
 
 
@@ -1242,7 +1259,17 @@ boolean postSensorData(Data* data[], int dataCount)
         displayEnabled=true;
         boolean rotateDisplay = (displayRotation == 180);
         if(display==NULL)
-          display = new Display(rotateDisplay, displayType,"",i2cSDAPort,i2cSCLPort);
+        {
+			switch(displayType)
+			{
+				case 3:
+					display = new DisplayST7735(rotateDisplay, displayType);
+					break;
+				default:	// Fallback to OLED init
+					display = new DisplayOLED128(displayWidth, displayHeight, rotateDisplay, displayType,"",i2cSDAPort,i2cSCLPort);
+					break;
+			}
+        }
         storeDisplayAndPowerConfig(false);
       }
       else if(payload.equals("dd") && displayEnabled==true)