New Display Structure to enable Display Rotation, different Styles etc.

Author: Manuel-Sensate

firmware-esp8266.ino

@@ -11,6 +11,7 @@
     SOURCE: https://github.com/sensate-io/firmware-esp8266.git
 
     @section  HISTORY
+    v40 - New Display Structure to enable Display Rotation, different Styles etc.
     v39 - ReAdded Support for VEML6075 and SI1145 UVI Sensors, added auto-reinit if sensor fails
     v38 - Changed automatic Update to only if required Update, removed VEML6075 and SI1145 UV Sensors
     v36 - Greatly improved reliability of connectivity
@@ -29,10 +30,12 @@
 #include "src/communication/WiFiManager.h"
 #include "src/controller/OTA.h"
 #include "src/communication/RestServer.h"
+#include "src/output/VisualisationHelper.h"
 
+VisualisationHelper* vHelper;
 Display* display = NULL;
 
-int currentVersion = 39; 
+int currentVersion = 40; 
 boolean printMemory = false;
 
 String board = "Generic";
@@ -96,6 +99,8 @@ void setup()
 
   restoreBridgeConfig();
 
+  vHelper =  new VisualisationHelper();
+
   doPowerSavingInit(true);
 
   Serial.println("Display Type:"+String(displayType));
@@ -173,6 +178,7 @@ void runTick() {
   switch(state)
   {
     case Operating:
+      loopDisplay(currentMillis);
       loopSensor(currentMillis);
       break;
   }

src/controller/Bridge.cpp

@@ -11,6 +11,7 @@
     SOURCE: https://github.com/sensate-io/firmware-esp8266.git
 
     @section  HISTORY
+    v40 - New Display Structure to enable Display Rotation, different Styles etc.
     v36 - Greatly improved reliability of connectivity
     v35 - Added Support for VEML6075 and SI1145 UVI Sensors
     v34 - Added Generic Analog Sensor Support
@@ -76,6 +77,8 @@ int configRetry = 0;
 int postSensorDataRetry = 0;
 int sensorCycle = 1;
 
+extern VisualisationHelper* vHelper;
+
 std::unique_ptr<BearSSL::WiFiClientSecure>sslClient(new BearSSL::WiFiClientSecure);
 
 bool initSSL()
@@ -401,6 +404,7 @@ bool getBridgeConfig() {
           else
           {
             portNumber++;
+            configureDisplayValueData(portRow, configEntry);
           }
 
           if (configEntry.containsKey("et"))
@@ -417,6 +421,7 @@ bool getBridgeConfig() {
           display->clear(false);
           display->drawProductLogo();
           display->drawString(0, 10, "Waiting for sensors...");
+          initVisualisationHelper(bridgeConfig);
         }
 
       }
@@ -536,6 +541,29 @@ void configureBridge(JsonObject& bridgeConfig) {
   doPowerSavingInit(false);
 }
 
+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)
+  {
+    Serial.println("Display cycle disabled (Interval = 0)");
+  }
+  else
+  {
+    vHelper->enableDisplayCycle(millis(), simultanValueCount, displayCycleInterval);
+  }
+
+}
+
+
 void storeDisplayAndPowerConfig(boolean withPowerSettings) {
 
   EEPROM.begin(314);
@@ -644,6 +672,11 @@ void tryInitMQTT() {
 
 }
 
+void configureDisplayValueData(int portNumber, JsonObject& portConfig) {
+
+  vHelper->getDisplayDataModel()->setData(portNumber, new DisplayValueData(portNumber, portConfig["n"], portConfig["sn"], "WAIT"));
+
+}
 
 void configureExpansionPort(int portNumber, JsonObject& portConfig) {
   Serial.println("Configure Expansion Port: ");
@@ -873,6 +906,13 @@ void addSensor(Sensor *sensor)
   }
 }
 
+void loopDisplay(unsigned long currentTimeMs) {
+  if(display!=NULL)
+  {
+    display->drawData(currentTimeMs);
+  }
+}
+
 void loopSensor(int currentTimeMs) {
 
   Data *data[maxSensorCount];
@@ -986,6 +1026,7 @@ void trySleep(long microseconds)
 
     if(powerMode==2 && microseconds>0)
     {
+      loopDisplay(millis());
       doPowerSaving();
       Serial.println("Going to deep sleep for "+String(microseconds));
       ESP.deepSleep(microseconds);

src/controller/Bridge.h

@@ -11,6 +11,7 @@
     SOURCE: https://github.com/sensate-io/firmware-esp8266.git
 
     @section  HISTORY
+    v40 - New Display Structure to enable Display Rotation, different Styles etc.
     v36 - Greatly improved reliability of connectivity
     v35 - Added Support for VEML6075 and SI1145 UVI Sensors
     v33 - Added Digital Sensor Switch Support
@@ -44,6 +45,7 @@
 #include "../input/onewire/SensorDHT.h"
 #include "../input/onewire/SensorDallas.h"
 #include "../output/display/DisplayOLED128.h"
+#include "../output/VisualisationHelper.h"
 
 bool initSSL();
 bool registerBridge();
@@ -52,10 +54,13 @@ void restart();
 
 bool getBridgeConfig();
 void configureBridge(JsonObject&);
+void initVisualisationHelper(JsonObject&);
+void configureDisplayValueData(int, JsonObject&);
 void configureExpansionPort(int, JsonObject&);
 void configurePort(int, JsonObject&);
 void addSensor(Sensor *);
 void loopSensor(int);
+void loopDisplay(unsigned long);
 boolean postSensorData(Data* data[], int);
 void checkStatus();
 void trySleep(long);