moved the output buffer out of the BSS section to resolve a bss size issue in some of the platform builds.

Author: MartinMueller2003

include/output/OutputMgr.hpp

@@ -37,6 +37,13 @@ class c_OutputCommon; ///< forward declaration to the pure virtual output class
 
 class c_OutputMgr
 {
+private:
+    #ifdef ARDUINO_ARCH_ESP8266
+    #define OM_MAX_NUM_CHANNELS  (1200 * 3)
+    #else // ARDUINO_ARCH_ESP32
+    #define OM_MAX_NUM_CHANNELS  (3000 * 3)
+    #endif // !def ARDUINO_ARCH_ESP32
+
 public:
     c_OutputMgr ();
     virtual ~c_OutputMgr ();
@@ -51,9 +58,9 @@ class c_OutputMgr
     void      SetConfig         (ArduinoJson::JsonDocument & NewConfig);  ///< Save the current configuration data to nvram
     void      GetStatus         (JsonObject & jsonStatus);
     void      GetPortCounts     (uint16_t& PixelCount, uint16_t& SerialCount) {PixelCount = uint16_t(OutputChannelId_End); SerialCount = uint16_t(NUM_UARTS); }
-    uint8_t*  GetBufferAddress  () { return OutputBuffer; } ///< Get the address of the buffer into which the E1.31 handler will stuff data
+    uint8_t*  GetBufferAddress  () { return pOutputBuffer; } ///< Get the address of the buffer into which the E1.31 handler will stuff data
     uint32_t  GetBufferUsedSize () { return UsedBufferSize; } ///< Get the size (in intensities) of the buffer into which the E1.31 handler will stuff data
-    uint32_t  GetBufferSize     () { return sizeof(OutputBuffer); } ///< Get the size (in intensities) of the buffer into which the E1.31 handler will stuff data
+    uint32_t  GetBufferSize     () { return uint32_t(OM_MAX_NUM_CHANNELS); } ///< Get the size (in intensities) of the buffer into which the E1.31 handler will stuff data
     void      DeleteConfig      () { FileMgr.DeleteFlashFile (ConfigFileName); }
     void      PauseOutputs      (bool NewState);
     void      GetDriverName     (String & Name) { Name = "OutputMgr"; }
@@ -197,12 +204,6 @@ class c_OutputMgr
         OutputType_Start = OutputType_Disabled,
     };
 
-#ifdef ARDUINO_ARCH_ESP8266
-#   define OM_MAX_NUM_CHANNELS  (1200 * 3)
-#else // ARDUINO_ARCH_ESP32
-#   define OM_MAX_NUM_CHANNELS  (3000 * 3)
-#endif // !def ARDUINO_ARCH_ESP32
-
     enum OM_PortType_t
     {
         Uart = 0,
@@ -255,7 +256,7 @@ class c_OutputMgr
 
     String ConfigFileName;
 
-    uint8_t    OutputBuffer[OM_MAX_NUM_CHANNELS];
+    uint8_t    pOutputBuffer = nullptr;
     uint32_t   UsedBufferSize = 0;
 
     #ifndef DEFAULT_CONSOLE_TX_GPIO

src/output/OutputMgr.cpp

@@ -211,7 +211,8 @@ c_OutputMgr::c_OutputMgr ()
     ConfigFileName = String ("/") + String (CN_output_config) + CN_Dotjson;
 
     // clear the input data buffer
-    memset ((char*)&OutputBuffer[0], 0, sizeof (OutputBuffer));
+    pOutputBuffer = (uint8_t*)malloc(GetBufferSize() + 1);
+    memset (pOutputBuffer, 0, GetBufferSize());
     for (DriverInfo_t & CurrentOutput : OutputChannelDrivers)
     {
         memset (CurrentOutput.OutputDriver, 0, sizeof (CurrentOutput.OutputDriver));
@@ -284,7 +285,7 @@ void c_OutputMgr::Begin ()
         // CreateNewConfig();
 
         // Preset the output memory
-        memset((void*)&OutputBuffer[0], 0x00, sizeof(OutputBuffer));
+        memset(pOutputBuffer, 0x00, GetBufferSize());
 
     } while (false);
 
@@ -391,7 +392,7 @@ void c_OutputMgr::CreateNewConfig ()
     // DEBUG_V ();
 
     JsonWrite(JsonConfig, CN_cfgver,      ConstConfig.CurrentConfigVersion);
-    JsonWrite(JsonConfig, CN_MaxChannels, sizeof(OutputBuffer));
+    JsonWrite(JsonConfig, CN_MaxChannels, GetBufferSize());
 
     // DEBUG_V("Collect the all ports disabled config first");
     CreateJsonConfig (JsonConfig);
@@ -1451,12 +1452,12 @@ void c_OutputMgr::UpdateDisplayBufferReferences (void)
 
         CurrentOutput.OutputBufferStartingOffset = OutputBufferOffset;
         CurrentOutput.OutputChannelStartingOffset = OutputChannelOffset;
-        ((c_OutputCommon*)CurrentOutput.OutputDriver)->SetOutputBufferAddress(&OutputBuffer[OutputBufferOffset]);
+        ((c_OutputCommon*)CurrentOutput.OutputDriver)->SetOutputBufferAddress(pOutputBuffer + OutputBufferOffset);
 
         uint32_t OutputBufferDataBytesNeeded        = ((c_OutputCommon*)CurrentOutput.OutputDriver)->GetNumOutputBufferBytesNeeded ();
         uint32_t VirtualOutputBufferDataBytesNeeded = ((c_OutputCommon*)CurrentOutput.OutputDriver)->GetNumOutputBufferChannelsServiced ();
 
-        uint32_t AvailableChannels = sizeof(OutputBuffer) - OutputBufferOffset;
+        uint32_t AvailableChannels = GetBufferSize() - OutputBufferOffset;
 
         if (AvailableChannels < OutputBufferDataBytesNeeded)
         {