PR feedback addressed

Author: ClutchplateDude

boards/ESP32_ESP32DEV/pins_OAE_V1.hpp

@@ -4,12 +4,6 @@
 
 #pragma once
 
-/**
- * @brief a pins configuration file for an ESP32-based OAT.
- */
-
-#pragma once
-
 // DRIVER_TYPE_TMC2209_UART requires 4 digital pins in Arduino pin numbering
 #ifndef RA_STEP_PIN
     #define RA_STEP_PIN 14  // STEP
@@ -131,4 +125,4 @@
 #endif
 #ifndef DEC_PULLEY_TEETH
     #define DEC_PULLEY_TEETH 1
-#endif
+#endif

src/InfoDisplayRender.hpp

@@ -1,17 +1,116 @@
 #pragma once
 #include <Arduino.h>
-
-class Mount;
+#include <String.h>
+#include "OLEDDisplay.h"
+#include "fonts128x64.h"
+#include "../Configuration.hpp"
 
 // Base class to implement a
 class InfoDisplayRender
 {
+    const static int MAX_CONSOLE_LINES     = 16;  // Maximum number of lines of text to buffer in console mode
+    const static int DISPLAY_CONSOLE_LINES = 6;   // Number of lines to display in console mode
+
+protected:
+    OLEDDisplay *_display;
+    long _lastNumCmds;
+    bool _consoleMode;
+    String _textList[MAX_CONSOLE_LINES];
+    int _curLine;
+
   public:
-    InfoDisplayRender() {};
+    InfoDisplayRender()
+    {
+        _consoleMode = true;
+        _curLine     = 0;
+        for (int i = 0; i < MAX_CONSOLE_LINES; i++)
+        {
+            _textList[i] = "";
+        }
+    };
+
+    virtual void init()
+    {
+        _display->init();
+        _display->clear();
+        _display->displayOn();
+    };
+
+    OLEDDisplay *getDisplayDevice()
+    {
+        return _display;
+    };
+
+    virtual void renderScreen(void *context) =0;
+
+    // Build the display from the mount
+    virtual void render(void (*drawContentFunction)(void*))
+    {
+        _display->clear();
+        if (drawContentFunction)
+        {
+            drawContentFunction(this);
+        }
+
+        if (_consoleMode)
+        {
+            // Console lines
+            int y = 21;
+            _display->setFont(Bitmap3x5);
+            // Start 6 lines back from current line and display next 6 lines
+            int indexStart = max(0, _curLine - DISPLAY_CONSOLE_LINES);
+            int indexEnd   = min(indexStart + DISPLAY_CONSOLE_LINES, MAX_CONSOLE_LINES);
+            for (int i = indexStart; i < indexEnd; i++)
+            {
+                if (_textList[i].length() != 0)
+                {
+                    String text = _textList[i];
+                    text.toUpperCase();
+                    _display->drawString(0, y, text);
+                }
+                y += 7;
+            }
+        }
+        else
+        {
+        }
+
+        _display->display();
+    };
+
+    virtual void setConsoleMode(bool active)
+    {
+        _consoleMode = active;
+    };
+
+    virtual int addConsoleText(const String& text, bool tinyFont = true)
+    {
+        int returnIndex = 0;
+        if (_curLine > MAX_CONSOLE_LINES - 1)
+        {
+            for (int i = 0; i < MAX_CONSOLE_LINES - 1; i++)
+            {
+                _textList[i] = _textList[i + 1];
+            }
+            _curLine            = MAX_CONSOLE_LINES - 1;
+            _textList[_curLine] = text;
+            returnIndex         = _curLine;
+        }
+        else
+        {
+            returnIndex           = _curLine;
+            _textList[_curLine++] = text;
+        }
+        render(nullptr);
+        return returnIndex;
+    };
 
-    virtual void init() {};
-    virtual void render(Mount *mount) {};
-    virtual void setConsoleMode(bool active) {};
-    virtual int addConsoleText(String text, bool tinyFont = true);
-    virtual void updateConsoleText(int line, String newText);
+    virtual void updateConsoleText(int line, String text)
+    {
+        if (line >= 0 && line < MAX_CONSOLE_LINES)
+        {
+            _textList[line] = text;
+        }
+        render(nullptr);
+    };
 };

src/Mount.cpp

@@ -3332,6 +3332,7 @@ void Mount::setupInfoDisplay()
     infoDisplay = new SDD1306OLED128x64(INFO_DISPLAY_I2C_ADDRESS, INFO_DISPLAY_I2C_SDA_PIN, INFO_DISPLAY_I2C_SCL_PIN);
     LOG(DEBUG_ANY, "[SYSTEM]: SSD1306 OLED created... initializing");
     infoDisplay->init();
+    infoDisplay->setConsoleMode(true);
     LOG(DEBUG_DISPLAY, "[DISPLAY]: Created and initialized SSD1306 OLED class...");
     #endif
 }
@@ -3358,7 +3359,7 @@ void Mount::updateInfoDisplay()
     if (now - _lastInfoUpdate > (1000 / refreshRateHz))
     {
         LOG(DEBUG_DISPLAY, "[DISPLAY]: Render state to OLED ...");
-        infoDisplay->render(this);
+        infoDisplay->renderScreen((void*)this);
         LOG(DEBUG_DISPLAY, "[DISPLAY]: Rendered state to OLED ...");
         _lastInfoUpdate = now;
     }