Stopped crashes on servo init

ESPixelStick/ESPixelStick.ino

@@ -146,24 +146,27 @@ void setup()
 
     // Load configuration from the File System and set Hostname
     loadConfig();
-    // DEBUG_V ("");
-
-    // Set up the output manager to start sending data to the serial ports
-    OutputMgr.Begin ();
-    // DEBUG_V ("");
 
+    // DEBUG_V(String("InputMgr Heap: ") + String(ESP.getFreeHeap()));
     // connect the input processing to the output processing.
-    InputMgr.Begin (OutputMgr.GetBufferUsedSize ());
-    // DEBUG_V ("");
+    InputMgr.Begin (0);
 
-    NetworkMgr.Begin ();
-    // DEBUG_V ("");
+    // DEBUG_V(String("OutputMgr Heap: ") + String(ESP.getFreeHeap()));
+    // Set up the output manager to start sending data to the serial ports
+    OutputMgr.Begin();
 
+    // DEBUG_V(String("NetworkMgr Heap: ") + String(ESP.getFreeHeap()));
+    NetworkMgr.Begin();
+
+    // DEBUG_V(String("WebMgr Heap: ") + String(ESP.getFreeHeap()));
     // Configure and start the web server
     WebMgr.Begin(&config);
 
+    // DEBUG_V(String("FPPDiscovery Heap: ") + String(ESP.getFreeHeap()));
     FPPDiscovery.begin ();
 
+    // DEBUG_V(String("Final Heap: ") + String(ESP.getFreeHeap()));
+
 #ifdef ARDUINO_ARCH_ESP8266
     // * ((volatile uint32_t*)0x60000900) &= ~(1); // Hardware WDT OFF
     ESP.wdtEnable (2000); // 2 seconds

ESPixelStick/src/FileMgr.cpp

@@ -381,17 +381,29 @@ bool c_FileMgr::SaveConfigFile(const String &FileName, JsonDocument &FileData)
     bool Response = false;
 
     String CfgFileMessagePrefix = String(CN_Configuration_File_colon) + "'" + FileName + "' ";
+    // DEBUG_V(String("CfgFileMessagePrefix: ") + CfgFileMessagePrefix);
+
+    // serializeJson(FileData, LOG_PORT);
+    // DEBUG_V("");
+
+    // delay(100);
+    // DEBUG_V("");
 
     fs::File file = LittleFS.open(FileName.c_str(), "w");
+    // DEBUG_V("");
+
     if (!file)
     {
         logcon(String(CN_stars) + CfgFileMessagePrefix + String(F("Could not open file for writing..")) + CN_stars);
     }
     else
     {
+        // DEBUG_V("");
         file.seek(0, SeekSet);
+        // DEBUG_V("");
 
         size_t NumBytesSaved = serializeJson(FileData, file);
+        // DEBUG_V("");
 
         file.close();
 

ESPixelStick/src/GPIO_Defs.hpp

@@ -72,42 +72,39 @@ typedef enum
 } uart_port_t;
 #endif // def ARDUINO_ARCH_ESP8266
 
-#define SUPPORT_OutputType_UCS1903
-#define SUPPORT_OutputType_GS8208
-
 // Platform specific GPIO definitions
 #if defined (BOARD_ESP32_CAM)
-#   include "GPIO_Defs_ESP32_CAM.hpp"
+#   include "platformDefinitions/GPIO_Defs_ESP32_CAM.hpp"
 #elif defined (BOARD_ESP32_D1_MINI_ETH)
-#   include "GPIO_Defs_ESP32_D1_MINI_ETH.hpp"
+#   include "platformDefinitions/GPIO_Defs_ESP32_D1_MINI_ETH.hpp"
 #elif defined (BOARD_ESP32_D1_MINI)
-#   include "GPIO_Defs_ESP32_D1_MINI.hpp"
+#   include "platformDefinitions/GPIO_Defs_ESP32_D1_MINI.hpp"
 #elif defined (BOARD_ESP32_LOLIN_D32_PRO_ETH)
-#   include "GPIO_Defs_ESP32_LoLin_D32_PRO_ETH.hpp"
+#   include "platformDefinitions/GPIO_Defs_ESP32_LoLin_D32_PRO_ETH.hpp"
 #elif defined (BOARD_ESP32_LOLIN_D32_PRO)
-#   include "GPIO_Defs_ESP32_generic.hpp"
+#   include "platformDefinitions/GPIO_Defs_ESP32_generic.hpp"
 #elif defined (BOARD_ESP32_MH_ET_LIVE_MiniKit)
-#   include "GPIO_Defs_ESP32_MH_ET_LIVE_MiniKit.hpp"
+#   include "platformDefinitions/GPIO_Defs_ESP32_MH_ET_LIVE_MiniKit.hpp"
 #elif defined(BOARD_ESP32_QUINLED_QUAD_ETH)
-#   include "GPIO_Defs_ESP32_QUINLED_QUAD_ETH.hpp"
+#   include "platformDefinitions/GPIO_Defs_ESP32_QUINLED_QUAD_ETH.hpp"
 #elif defined(BOARD_ESP32_QUINLED_QUAD)
-#   include "GPIO_Defs_ESP32_QUINLED_QUAD.hpp"
+#   include "platformDefinitions/GPIO_Defs_ESP32_QUINLED_QUAD.hpp"
 #elif defined(BOARD_ESP32_QUINLED_UNO_ETH)
-#   include "GPIO_Defs_ESP32_QUINLED_UNO_ETH.hpp"
+#   include "platformDefinitions/GPIO_Defs_ESP32_QUINLED_UNO_ETH.hpp"
 #elif defined(BOARD_ESP32_QUINLED_UNO)
-#   include "GPIO_Defs_ESP32_QUINLED_UNO.hpp"
+#   include "platformDefinitions/GPIO_Defs_ESP32_QUINLED_UNO.hpp"
 #elif defined (BOARD_ESP32_TTGO_T8)
-#   include "GPIO_Defs_ESP32_TTGO_T8.hpp"
+#   include "platformDefinitions/GPIO_Defs_ESP32_TTGO_T8.hpp"
 #elif defined (BOARD_ESP32_WT32ETH01)
-#   include "GPIO_Defs_ESP32_WT32ETH01.hpp"
+#   include "platformDefinitions/GPIO_Defs_ESP32_WT32ETH01.hpp"
 #elif defined (BOARD_ESP01S)
-#   include "GPIO_Defs_ESP8266_ESP01S.hpp"
+#   include "platformDefinitions/GPIO_Defs_ESP8266_ESP01S.hpp"
 #elif defined (BOARD_ESPS_V3)
-#   include "GPIO_Defs_ESP8266_ESPS_V3.hpp"
+#   include "platformDefinitions/GPIO_Defs_ESP8266_ESPS_V3.hpp"
 #elif defined (ARDUINO_ARCH_ESP32)
-#   include "GPIO_Defs_ESP32_generic.hpp"
+#   include "platformDefinitions/GPIO_Defs_ESP32_generic.hpp"
 #elif defined(ARDUINO_ARCH_ESP8266)
-#   include "GPIO_Defs_ESP8266_Generic.hpp"
+#   include "platformDefinitions/GPIO_Defs_ESP8266_Generic.hpp"
 #else
 #   error "No valid platform definition"
 #endif // ndef platform specific GPIO definitions

ESPixelStick/src/WebMgr.cpp

@@ -112,6 +112,7 @@ void c_WebMgr::Begin (config_t* /* NewConfig */)
         // DEBUG_V(String("WebJsonDoc->capacity: 0x") + String(WebJsonDoc->capacity(), HEX));
 
         memset(pWebSocketFrameCollectionBuffer, 0x00, WebSocketFrameCollectionBufferSize + 1);
+        // DEBUG_V();
 
         if (NetworkMgr.IsConnected())
         {

ESPixelStick/src/input/InputEffectEngine.cpp

@@ -437,7 +437,7 @@ void c_InputEffectEngine::setPixel (uint16_t pixelId, CRGB color)
 
     if ((true == IsInputChannelActive) && (pixelId < PixelCount))
     {
-        uint8_t PixelBuffer[sizeof(CRGB)];
+        uint8_t PixelBuffer[sizeof(CRGB)+1];
 
         // DEBUG_V(String("ChannelsPerPixel * pixelId: 0x") + String(uint(ChannelsPerPixel * pixelId), HEX));
         // DEBUG_V (String ("EffectBrightness: ") + String (EffectBrightness));

ESPixelStick/src/input/InputMgr.cpp

@@ -253,8 +253,13 @@ void c_InputMgr::CreateNewConfig ()
     }
 
     // create a place to save the config
-    DynamicJsonDocument JsonConfigDoc (IM_JSON_SIZE);
-    JsonObject JsonConfig = JsonConfigDoc.createNestedObject (CN_input_config);
+    // DEBUG_V(String("Heap: ") + String(ESP.getFreeHeap()));
+
+    DynamicJsonDocument JsonConfigDoc(IM_JSON_SIZE);
+    // DEBUG_V("");
+
+    JsonObject JsonConfig = JsonConfigDoc.createNestedObject(CN_input_config);
+    // DEBUG_V("");
 
     JsonConfig[CN_cfgver] = CurrentConfigVersion;
 
@@ -263,10 +268,11 @@ void c_InputMgr::CreateNewConfig ()
          InputTypeId < int (InputType_End);
          ++InputTypeId)
     {
-        // DEBUG_V ("for each input channel");
+        // DEBUG_V(String("instantiate the Input type: ") + InputTypeId);
+        // DEBUG_V("for each input channel");
         for (auto & CurrentInput : InputChannelDrivers)
         {
-            // DEBUG_V (String("instantiate the Input type: ") + InputTypeId);
+            // DEBUG_V(String("DriverId: ") + CurrentInput.DriverId);
             InstantiateNewInputChannel (e_InputChannelIds(CurrentInput.DriverId), e_InputType(InputTypeId), false);
         }// end for each interface
 

ESPixelStick/src/output/OutputAPA102.cpp

@@ -18,7 +18,7 @@
 */
 
 #include "../ESPixelStick.h"
-#ifdef SUPPORT_OutputType_APA102
+#if defined(SUPPORT_OutputType_APA102)
 
 #include "OutputAPA102.hpp"
 
@@ -91,4 +91,4 @@ bool c_OutputAPA102::SetConfig (ArduinoJson::JsonObject& jsonConfig)
 
 } // SetConfig
 
-#endif // def SUPPORT_OutputType_APA102
+#endif // defined(SUPPORT_OutputType_APA102)

ESPixelStick/src/output/OutputAPA102.hpp

@@ -22,7 +22,7 @@
 *
 */
 #include "../ESPixelStick.h"
-#ifdef SUPPORT_OutputType_APA102
+#if defined(SUPPORT_OutputType_APA102)
 
 #include "OutputPixel.hpp"
 
@@ -58,4 +58,4 @@ class c_OutputAPA102 : public c_OutputPixel
 
 }; // c_OutputAPA102
 
-#endif // def SUPPORT_OutputType_APA102
+#endif // defined(SUPPORT_OutputType_APA102) && defined(SUPPORT_SPI_OUTPUT)

ESPixelStick/src/output/OutputAPA102Spi.cpp

@@ -106,4 +106,4 @@ void c_OutputAPA102Spi::Render ()
 
 } // render
 
-#endif // defined (SUPPORT_OutputType_APA102) && defined (SUPPORT_SPI_OUTPUT)
+#endif // defined(SUPPORT_OutputType_APA102) && defined(SUPPORT_SPI_OUTPUT)

ESPixelStick/src/output/OutputAPA102Spi.hpp

@@ -23,7 +23,7 @@
 */
 
 #include "../ESPixelStick.h"
-#ifdef SUPPORT_OutputType_APA102
+#if defined(SUPPORT_OutputType_APA102) && defined(SUPPORT_SPI_OUTPUT)
 
 #include "OutputAPA102.hpp"
 #include "OutputSpi.hpp"
@@ -51,4 +51,4 @@ class c_OutputAPA102Spi : public c_OutputAPA102
 
 }; // c_OutputAPA102Spi
 
-#endif // def SUPPORT_OutputType_APA102
+#endif // defined(SUPPORT_OutputType_APA102) && defined(SUPPORT_SPI_OUTPUT)

ESPixelStick/src/output/OutputCommon.cpp

@@ -81,12 +81,18 @@ c_OutputCommon::c_OutputCommon (c_OutputMgr::e_OutputChannelIds iOutputChannelId
 c_OutputCommon::~c_OutputCommon ()
 {
     // DEBUG_START;
-    if (gpio_num_t (-1) == DataPin) { return; }
-
-    pinMode (DataPin, INPUT_PULLUP);
+    if(HasBeenInitialized)
+    {
+        if (gpio_num_t(-1) == DataPin)
+        {
+            return;
+        }
+        // DEBUG_V("Set Pin Mode");
+        pinMode(DataPin, INPUT_PULLUP);
 
-    // DEBUG_V ("");
-    TerminateUartOperation ();
+        // DEBUG_V ("Terminate UART");
+        TerminateUartOperation();
+    }
     // DEBUG_END;
 } // ~c_OutputMgr
 

ESPixelStick/src/output/OutputGECE.cpp

@@ -18,6 +18,9 @@
 */
 
 #include "../ESPixelStick.h"
+
+#if defined(SUPPORT_OutputType_GECE) && defined(SUPPORT_UART_OUTPUT)
+
 #include "OutputGECE.hpp"
 #include <HardwareSerial.h>
 #ifdef ARDUINO_ARCH_ESP32
@@ -150,34 +153,37 @@ c_OutputGECE::~c_OutputGECE ()
 {
     // DEBUG_START;
 
-    GECE_OutputChanArray[OutputChannelId] = nullptr;
-
-    // clean up the timer ISR
-    bool foundActiveChannel = false;
-    for (auto currentChannel : GECE_OutputChanArray)
+    if(HasBeenInitialized)
     {
-        // DEBUG_V (String ("currentChannel: ") + String (uint(currentChannel), HEX));
-        if (nullptr != currentChannel)
+        GECE_OutputChanArray[OutputChannelId] = nullptr;
+
+        // clean up the timer ISR
+        bool foundActiveChannel = false;
+        for (auto currentChannel : GECE_OutputChanArray)
         {
-            // DEBUG_V ("foundActiveChannel");
-            foundActiveChannel = true;
+            // DEBUG_V (String ("currentChannel: ") + String (uint(currentChannel), HEX));
+            if (nullptr != currentChannel)
+            {
+                // DEBUG_V ("foundActiveChannel");
+                foundActiveChannel = true;
+            }
         }
-    }
 
-    // DEBUG_V ();
+        // DEBUG_V ();
 
-    // have all of the GECE channels been killed?
-    if (!foundActiveChannel)
-    {
-        // DEBUG_V ("Detach Interrupts");
+        // have all of the GECE channels been killed?
+        if (!foundActiveChannel)
+        {
+            // DEBUG_V ("Detach Interrupts");
 #ifdef ARDUINO_ARCH_ESP8266
-        timer1_detachInterrupt ();
+            timer1_detachInterrupt();
 #elif defined(ARDUINO_ARCH_ESP32)
-        if (pHwTimer)
-        {
-            timerAlarmDisable (pHwTimer);
-        }
+            if (pHwTimer)
+            {
+                timerAlarmDisable(pHwTimer);
+            }
 #endif
+        }
     }
 
     // DEBUG_END;
@@ -214,7 +220,7 @@ void c_OutputGECE::Begin ()
 
     if (gpio_num_t (-1) == DataPin) { return; }
 
-    SetOutputBufferSize (pixel_count * GECE_NUM_INTENSITY_BYTES_PER_PIXEL);
+    SetOutputBufferSize(pixel_count * GECE_NUM_INTENSITY_BYTES_PER_PIXEL);
 
     // DEBUG_V (String ("GECE_BAUDRATE: ") + String (GECE_BAUDRATE));
 
@@ -281,6 +287,9 @@ void c_OutputGECE::Begin ()
     timerAlarmEnable (pHwTimer);
 
 #endif
+
+    HasBeenInitialized = true;
+
     // DEBUG_END;
 } // begin
 
@@ -428,3 +437,5 @@ void c_OutputGECE::Render()
     // DEBUG_END;
 
 } // render
+
+#endif // defined(SUPPORT_OutputType_GECE) && defined(SUPPORT_UART_OUTPUT)

ESPixelStick/src/output/OutputGECE.hpp

@@ -19,6 +19,7 @@
 */
 
 #include "OutputCommon.hpp"
+#if defined(SUPPORT_OutputType_GECE) && defined(SUPPORT_UART_OUTPUT)
 
 class c_OutputGECE: public c_OutputCommon
 {
@@ -66,3 +67,5 @@ static inline uint32_t _getCycleCount (void) {
     __asm__ __volatile__ ("rsr %0,ccount":"=a" (ccount));
     return ccount;
 }
+
+#endif // defined(SUPPORT_OutputType_GECE) && defined(SUPPORT_UART_OUTPUT)

ESPixelStick/src/output/OutputGS8208.cpp

@@ -18,7 +18,8 @@
 */
 
 #include "../ESPixelStick.h"
-#ifdef SUPPORT_OutputType_GS8208
+
+#if defined(SUPPORT_OutputType_GS8208)
 
 #include "OutputGS8208.hpp"
 
@@ -114,4 +115,4 @@ bool c_OutputGS8208::SetConfig (ArduinoJson::JsonObject& jsonConfig)
 
 } // SetConfig
 
-#endif // def SUPPORT_OutputType_GS8208
+#endif // defined(SUPPORT_OutputType_GS8208)

ESPixelStick/src/output/OutputGS8208Rmt.cpp

@@ -18,8 +18,7 @@
 */
 #include "../ESPixelStick.h"
 
-#ifdef SUPPORT_OutputType_GS8208
-#ifdef SUPPORT_RMT_OUTPUT
+#if defined(SUPPORT_OutputType_GS8208) && defined(SUPPORT_RMT_OUTPUT)
 
 #include "OutputGS8208Rmt.hpp"
 
@@ -167,5 +166,4 @@ void c_OutputGS8208Rmt::Render ()
 
 } // Render
 
-#endif // def SUPPORT_RMT_OUTPUT
-#endif // def SUPPORT_OutputType_GS8208
+#endif // defined(SUPPORT_OutputType_GS8208) && defined(SUPPORT_RMT_OUTPUT)