Merge branch 'develop' into oae-fw

# Conflicts:
#	Changelog.md
#	ConfigurationValidation.hpp
#	boards/ESP32_ESP32DEV/pins_OAE_V1.hpp
#	src/SSD1306_128x64_Display.hpp
#	src/b_setup.hpp

Author: ClutchplateDude

Changelog.md

@@ -3,6 +3,8 @@
 
 **V1.13.17 - Updates**
 - Store AZ/ALT steps per degree and allow them to be set from Meade
+- Added more output to the InfoDisplay during boot and fixed a bug in console mode.
+- Fixed a bug that was causing the firmware to hang after a slew, if a :Q# command was issued (thanks to user c3n for tracking it down, pun intended).
 
 **V1.13.16 - Updates**
 - Throttled InfoDisplay updates. Turned off on two axis slew, limited to 5Hz on one-axis slew.

ConfigurationValidation.hpp

@@ -89,9 +89,8 @@
             #error AZ driver address for DRIVER_TYPE_TMC2209_UART not specified.
         #endif
     #endif
-#elif defined(BOARD_OAE_V1)
-// Valid
-
+#elif defined(OAE)
+// Valid OAE configuration
 #else
     #error Configuration does not support AZ. Use at own risk.
 #endif
@@ -112,7 +111,7 @@
         #endif
     #endif
 
-#elif defined(BOARD_OAE_V1)
+#elif defined(OAE)
 // Valid
 
 #else

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,5 @@
 #endif
 #ifndef DEC_PULLEY_TEETH
     #define DEC_PULLEY_TEETH 1
-#endif
+#endif
+#endif

platformio.ini

@@ -52,7 +52,6 @@ src_build_flags =
 	-Wno-unused-parameter
 ;	-Wold-style-cast
 	-Wlogical-op
-	-Wuseless-cast
 ; Wdouble-promotion can't be enabled until GCC bug 55578 is fixed, since floats are
 ; implicitly converted to doubles when passed to a variadic function (i.e. a printf-like).
 ; Else we could disable Wdouble-promotion only for our logv function inside of the LOG macro
@@ -83,6 +82,9 @@ upload_protocol = wiring
 build_flags =
 	${env.build_flags}
 	-D BOARD=BOARD_AVR_RAMPS
+src_build_flags =
+	${env.src_build_flags}
+	-Wuseless-cast
 debug_tool = avr-stub
 debug_build_flags =
 	${env.debug_build_flags}

src/InfoDisplayRender.hpp

@@ -1,17 +1,115 @@
 #pragma once
 #include <Arduino.h>
-
-class Mount;
+#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

@@ -2971,6 +2971,16 @@ void Mount::interruptLoop()
             _stepperRA->run();
         }
     }
+    else if (!(_mountStatus & STATUS_TRACKING) && (_stepperTRK->isRunning()))
+    {
+        // If we are not tracking, but the tracking stepper is running, we need to let it move.
+        // This can happen when we need to compensate for a slew (during which the tracker is
+        // stopped). After the slew, the tracker is advanced by the distance it would have
+        // travelled during the slew if it had been tracking.
+        // That compensation uses goto mode (using runToNewPosition()), so we need to use run(),
+        // since runSpeed() only advances the stepper when it is in constant speed mode.
+        _stepperTRK->run();
+    }
 
     if (_mountStatus & STATUS_FINDING_HOME)
     {
@@ -3322,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
 }
@@ -3348,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;
     }