pixelcade: fix memory leak. change IsV23 to FirmwareVersion

jsm174 · jsm174 · commit 0944f736c214 · 2025-10-22T23:55:17.000-04:00
diff --git a/src/DMD.cpp b/src/DMD.cpp
@@ -1246,7 +1246,7 @@ void DMD::PixelcadeDMDThread()
           else
             continue;
 
-          if (m_pPixelcadeDMD->GetIsV23())
+          if (m_pPixelcadeDMD->GetIsV2())
           {
             m_pPixelcadeDMD->UpdateRGB24(scaledBuffer);
           }
@@ -1263,6 +1263,8 @@ void DMD::PixelcadeDMDThread()
             }
             update = true;
           }
+
+          delete[] scaledBuffer;
         }
         else if (m_pUpdateBufferQueue[bufferPositionMod]->mode == Mode::RGB16)
         {
@@ -1277,23 +1279,7 @@ void DMD::PixelcadeDMDThread()
           else
             continue;
 
-          if (m_pPixelcadeDMD->GetIsV23())
-          {
-            uint8_t* rgb24Data = new uint8_t[targetLength * 3];
-            for (int i = 0; i < targetLength; i++)
-            {
-              uint16_t pixel = rgb565Data[i];
-              rgb24Data[i * 3] = (pixel >> 8) & 0xF8;       // Red
-              rgb24Data[i * 3 + 1] = (pixel >> 3) & 0xFC;   // Green
-              rgb24Data[i * 3 + 2] = (pixel << 3) & 0xF8;   // Blue
-            }
-            m_pPixelcadeDMD->UpdateRGB24(rgb24Data);
-            delete[] rgb24Data;
-          }
-          else
-          {
-            update = true;
-          }
+          update = true;
         }
         else if (IsSerumV2Mode(m_pUpdateBufferQueue[bufferPositionMod]->mode))
         {
@@ -1375,26 +1361,7 @@ void DMD::PixelcadeDMDThread()
           }
         }
 
-        if (update)
-        {
-          if (m_pPixelcadeDMD->GetIsV23())
-          {
-            uint8_t* rgb24Data = new uint8_t[targetLength * 3];
-            for (int i = 0; i < targetLength; i++)
-            {
-              uint16_t pixel = rgb565Data[i];
-              rgb24Data[i * 3] = (pixel >> 8) & 0xF8;       // Red
-              rgb24Data[i * 3 + 1] = (pixel >> 3) & 0xFC;   // Green
-              rgb24Data[i * 3 + 2] = (pixel << 3) & 0xF8;   // Blue
-            }
-            m_pPixelcadeDMD->UpdateRGB24(rgb24Data);
-            delete[] rgb24Data;
-          }
-          else
-          {
-            m_pPixelcadeDMD->Update(rgb565Data);
-          }
-        }
+        if (update) m_pPixelcadeDMD->Update(rgb565Data);
       }
     }
   }
diff --git a/src/PixelcadeDMD.cpp b/src/PixelcadeDMD.cpp
@@ -16,14 +16,15 @@
 namespace DMDUtil
 {
 
-PixelcadeDMD::PixelcadeDMD(struct sp_port* pSerialPort, int width, int height, bool colorSwap, bool isV2, bool isV23)
+PixelcadeDMD::PixelcadeDMD(struct sp_port* pSerialPort, int width, int height, bool colorSwap, bool isV2,
+                           int firmwareVersion)
 {
   m_pSerialPort = pSerialPort;
   m_width = width;
   m_height = height;
   m_colorSwap = colorSwap;
   m_isV2 = isV2;
-  m_isV23 = isV23;
+  m_firmwareVersion = firmwareVersion;
   m_length = width * height;
   m_pThread = nullptr;
   m_running = false;
@@ -140,7 +141,7 @@ PixelcadeDMD* PixelcadeDMD::Open(const char* pDevice)
   int width = 128;
   int height = 32;
   bool isV2 = false;
-  bool isV23 = false;
+  int firmwareVersion = 0;
   bool colorSwap = false;
 
   if (firmware[0] == 'P' && firmware[1] != 0 && firmware[2] != 0 && firmware[3] != 0)
@@ -160,19 +161,18 @@ PixelcadeDMD* PixelcadeDMD::Open(const char* pDevice)
 
     if (firmware[6] != 0 && firmware[7] != 0)
     {
-      int version = (firmware[6] - '0') * 10 + (firmware[7] - '0');
-      isV23 = (version >= 23);
+      firmwareVersion = (firmware[6] - '0') * 10 + (firmware[7] - '0');
     }
 
     colorSwap = (firmware[4] == 'C') && !isV2;
   }
 
   Log(DMDUtil_LogLevel_INFO,
-      "Pixelcade found: device=%s, Hardware ID=%s, Bootloader ID=%s, Firmware=%s, Size=%dx%d, V2=%d, V23=%d, "
+      "Pixelcade found: device=%s, Hardware ID=%s, Bootloader ID=%s, Firmware=%s, Size=%dx%d, V2=%d, FW=%d, "
       "ColorSwap=%d",
-      pDevice, hardwareId, bootloaderId, firmware, width, height, isV2, isV23, colorSwap);
+      pDevice, hardwareId, bootloaderId, firmware, width, height, isV2, firmwareVersion, colorSwap);
 
-  return new PixelcadeDMD(pSerialPort, width, height, colorSwap, isV2, isV23);
+  return new PixelcadeDMD(pSerialPort, width, height, colorSwap, isV2, firmwareVersion);
 }
 
 void PixelcadeDMD::Update(uint16_t* pData)
@@ -247,11 +247,12 @@ void PixelcadeDMD::EnableRgbLedMatrix(int shifterLen32, int rows)
 
   if (m_isV2)
   {
-    uint8_t command = m_isV23 ? PIXELCADE_COMMAND_RGB_LED_MATRIX_ENABLE_V23 : PIXELCADE_COMMAND_RGB_LED_MATRIX_ENABLE;
+    uint8_t command =
+        (m_firmwareVersion >= 23) ? PIXELCADE_COMMAND_RGB_LED_MATRIX_ENABLE_V23 : PIXELCADE_COMMAND_RGB_LED_MATRIX_ENABLE;
     uint8_t frame[8];
     int frameSize;
 
-    if (m_isV23)
+    if (m_firmwareVersion >= 23)
     {
       frameSize = BuildFrame(frame, sizeof(frame), command, &configData, 1);
     }
@@ -280,7 +281,7 @@ void PixelcadeDMD::Run()
       {
         Log(DMDUtil_LogLevel_INFO, "PixelcadeDMD run thread starting");
 
-        if (m_isV23)
+        if (m_firmwareVersion >= 23)
         {
           uint8_t initCmd = PIXELCADE_COMMAND_V23_INIT;
           sp_blocking_write(m_pSerialPort, &initCmd, 1, 0);
@@ -337,7 +338,7 @@ void PixelcadeDMD::Run()
               }
 
               int frameSize;
-              if (m_isV23)
+              if (m_firmwareVersion >= 23)
               {
                 memcpy(pFrameData + 5, frame.pData, payloadSize);
                 frameSize = BuildFrame(pFrameData, maxFrameDataSize + 10, command, pFrameData + 5, payloadSize);
diff --git a/src/PixelcadeDMD.h b/src/PixelcadeDMD.h
@@ -46,7 +46,7 @@ struct PixelcadeFrame
 class PixelcadeDMD
 {
  public:
-  PixelcadeDMD(struct sp_port* pSerialPort, int width, int height, bool colorSwap, bool isV2, bool isV23);
+  PixelcadeDMD(struct sp_port* pSerialPort, int width, int height, bool colorSwap, bool isV2, int firmwareVersion);
   ~PixelcadeDMD();
 
   static PixelcadeDMD* Connect(const char* pDevice = nullptr);
@@ -56,7 +56,7 @@ class PixelcadeDMD
   int GetWidth() const { return m_width; }
   int GetHeight() const { return m_height; }
   bool GetIsV2() const { return m_isV2; }
-  bool GetIsV23() const { return m_isV23; }
+  int GetFirmwareVersion() const { return m_firmwareVersion; }
 
  private:
   static PixelcadeDMD* Open(const char* pDevice);
@@ -71,7 +71,7 @@ class PixelcadeDMD
   int m_height;
   bool m_colorSwap;
   bool m_isV2;
-  bool m_isV23;
+  int m_firmwareVersion;
   int m_length;
 
   std::thread* m_pThread;

Original file line number	Diff line number	Diff line change
`@@ -1246,7 +1246,7 @@ void DMD::PixelcadeDMDThread()`
`1246`	`1246`	`else`
`1247`	`1247`	`continue;`
`1248`	`1248`
`1249`		`- if (m_pPixelcadeDMD->GetIsV23())`
	`1249`	`+ if (m_pPixelcadeDMD->GetIsV2())`
`1250`	`1250`	`{`
`1251`	`1251`	`m_pPixelcadeDMD->UpdateRGB24(scaledBuffer);`
`1252`	`1252`	`}`
`@@ -1263,6 +1263,8 @@ void DMD::PixelcadeDMDThread()`
`1263`	`1263`	`}`
`1264`	`1264`	`update = true;`
`1265`	`1265`	`}`
	`1266`	`+`
	`1267`	`+ delete[] scaledBuffer;`
`1266`	`1268`	`}`
`1267`	`1269`	`else if (m_pUpdateBufferQueue[bufferPositionMod]->mode == Mode::RGB16)`
`1268`	`1270`	`{`
`@@ -1277,23 +1279,7 @@ void DMD::PixelcadeDMDThread()`
`1277`	`1279`	`else`
`1278`	`1280`	`continue;`
`1279`	`1281`
`1280`		`- if (m_pPixelcadeDMD->GetIsV23())`
`1281`		`- {`
`1282`		`- uint8_t* rgb24Data = new uint8_t[targetLength * 3];`
`1283`		`- for (int i = 0; i < targetLength; i++)`
`1284`		`- {`
`1285`		`- uint16_t pixel = rgb565Data[i];`
`1286`		`- rgb24Data[i * 3] = (pixel >> 8) & 0xF8; // Red`
`1287`		`- rgb24Data[i * 3 + 1] = (pixel >> 3) & 0xFC; // Green`
`1288`		`- rgb24Data[i * 3 + 2] = (pixel << 3) & 0xF8; // Blue`
`1289`		`- }`
`1290`		`- m_pPixelcadeDMD->UpdateRGB24(rgb24Data);`
`1291`		`- delete[] rgb24Data;`
`1292`		`- }`
`1293`		`- else`
`1294`		`- {`
`1295`		`- update = true;`
`1296`		`- }`
	`1282`	`+ update = true;`
`1297`	`1283`	`}`
`1298`	`1284`	`else if (IsSerumV2Mode(m_pUpdateBufferQueue[bufferPositionMod]->mode))`
`1299`	`1285`	`{`
`@@ -1375,26 +1361,7 @@ void DMD::PixelcadeDMDThread()`
`1375`	`1361`	`}`
`1376`	`1362`	`}`
`1377`	`1363`
`1378`		`- if (update)`
`1379`		`- {`
`1380`		`- if (m_pPixelcadeDMD->GetIsV23())`
`1381`		`- {`
`1382`		`- uint8_t* rgb24Data = new uint8_t[targetLength * 3];`
`1383`		`- for (int i = 0; i < targetLength; i++)`
`1384`		`- {`
`1385`		`- uint16_t pixel = rgb565Data[i];`
`1386`		`- rgb24Data[i * 3] = (pixel >> 8) & 0xF8; // Red`
`1387`		`- rgb24Data[i * 3 + 1] = (pixel >> 3) & 0xFC; // Green`
`1388`		`- rgb24Data[i * 3 + 2] = (pixel << 3) & 0xF8; // Blue`
`1389`		`- }`
`1390`		`- m_pPixelcadeDMD->UpdateRGB24(rgb24Data);`
`1391`		`- delete[] rgb24Data;`
`1392`		`- }`
`1393`		`- else`
`1394`		`- {`
`1395`		`- m_pPixelcadeDMD->Update(rgb565Data);`
`1396`		`- }`
`1397`		`- }`
	`1364`	`+ if (update) m_pPixelcadeDMD->Update(rgb565Data);`
`1398`	`1365`	`}`
`1399`	`1366`	`}`
`1400`	`1367`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,14 +16,15 @@`
`16`	`16`	`namespace DMDUtil`
`17`	`17`	`{`
`18`	`18`
`19`		`-PixelcadeDMD::PixelcadeDMD(struct sp_port* pSerialPort, int width, int height, bool colorSwap, bool isV2, bool isV23)`
	`19`	`+PixelcadeDMD::PixelcadeDMD(struct sp_port* pSerialPort, int width, int height, bool colorSwap, bool isV2,`
	`20`	`+ int firmwareVersion)`
`20`	`21`	`{`
`21`	`22`	`m_pSerialPort = pSerialPort;`
`22`	`23`	`m_width = width;`
`23`	`24`	`m_height = height;`
`24`	`25`	`m_colorSwap = colorSwap;`
`25`	`26`	`m_isV2 = isV2;`
`26`		`- m_isV23 = isV23;`
	`27`	`+ m_firmwareVersion = firmwareVersion;`
`27`	`28`	`m_length = width * height;`
`28`	`29`	`m_pThread = nullptr;`
`29`	`30`	`m_running = false;`
`@@ -140,7 +141,7 @@ PixelcadeDMD* PixelcadeDMD::Open(const char* pDevice)`
`140`	`141`	`int width = 128;`
`141`	`142`	`int height = 32;`
`142`	`143`	`bool isV2 = false;`
`143`		`- bool isV23 = false;`
	`144`	`+ int firmwareVersion = 0;`
`144`	`145`	`bool colorSwap = false;`
`145`	`146`
`146`	`147`	`if (firmware[0] == 'P' && firmware[1] != 0 && firmware[2] != 0 && firmware[3] != 0)`
`@@ -160,19 +161,18 @@ PixelcadeDMD* PixelcadeDMD::Open(const char* pDevice)`
`160`	`161`
`161`	`162`	`if (firmware[6] != 0 && firmware[7] != 0)`
`162`	`163`	`{`
`163`		`- int version = (firmware[6] - '0') * 10 + (firmware[7] - '0');`
`164`		`- isV23 = (version >= 23);`
	`164`	`+ firmwareVersion = (firmware[6] - '0') * 10 + (firmware[7] - '0');`
`165`	`165`	`}`
`166`	`166`
`167`	`167`	`colorSwap = (firmware[4] == 'C') && !isV2;`
`168`	`168`	`}`
`169`	`169`
`170`	`170`	`Log(DMDUtil_LogLevel_INFO,`
`171`		`- "Pixelcade found: device=%s, Hardware ID=%s, Bootloader ID=%s, Firmware=%s, Size=%dx%d, V2=%d, V23=%d, "`
	`171`	`+ "Pixelcade found: device=%s, Hardware ID=%s, Bootloader ID=%s, Firmware=%s, Size=%dx%d, V2=%d, FW=%d, "`
`172`	`172`	`"ColorSwap=%d",`
`173`		`- pDevice, hardwareId, bootloaderId, firmware, width, height, isV2, isV23, colorSwap);`
	`173`	`+ pDevice, hardwareId, bootloaderId, firmware, width, height, isV2, firmwareVersion, colorSwap);`
`174`	`174`
`175`		`- return new PixelcadeDMD(pSerialPort, width, height, colorSwap, isV2, isV23);`
	`175`	`+ return new PixelcadeDMD(pSerialPort, width, height, colorSwap, isV2, firmwareVersion);`
`176`	`176`	`}`
`177`	`177`
`178`	`178`	`void PixelcadeDMD::Update(uint16_t* pData)`
`@@ -247,11 +247,12 @@ void PixelcadeDMD::EnableRgbLedMatrix(int shifterLen32, int rows)`
`247`	`247`
`248`	`248`	`if (m_isV2)`
`249`	`249`	`{`
`250`		`- uint8_t command = m_isV23 ? PIXELCADE_COMMAND_RGB_LED_MATRIX_ENABLE_V23 : PIXELCADE_COMMAND_RGB_LED_MATRIX_ENABLE;`
	`250`	`+ uint8_t command =`
	`251`	`+ (m_firmwareVersion >= 23) ? PIXELCADE_COMMAND_RGB_LED_MATRIX_ENABLE_V23 : PIXELCADE_COMMAND_RGB_LED_MATRIX_ENABLE;`
`251`	`252`	`uint8_t frame[8];`
`252`	`253`	`int frameSize;`
`253`	`254`
`254`		`- if (m_isV23)`
	`255`	`+ if (m_firmwareVersion >= 23)`
`255`	`256`	`{`
`256`	`257`	`frameSize = BuildFrame(frame, sizeof(frame), command, &configData, 1);`
`257`	`258`	`}`
`@@ -280,7 +281,7 @@ void PixelcadeDMD::Run()`
`280`	`281`	`{`
`281`	`282`	`Log(DMDUtil_LogLevel_INFO, "PixelcadeDMD run thread starting");`
`282`	`283`
`283`		`- if (m_isV23)`
	`284`	`+ if (m_firmwareVersion >= 23)`
`284`	`285`	`{`
`285`	`286`	`uint8_t initCmd = PIXELCADE_COMMAND_V23_INIT;`
`286`	`287`	`sp_blocking_write(m_pSerialPort, &initCmd, 1, 0);`
`@@ -337,7 +338,7 @@ void PixelcadeDMD::Run()`
`337`	`338`	`}`
`338`	`339`
`339`	`340`	`int frameSize;`
`340`		`- if (m_isV23)`
	`341`	`+ if (m_firmwareVersion >= 23)`
`341`	`342`	`{`
`342`	`343`	`memcpy(pFrameData + 5, frame.pData, payloadSize);`
`343`	`344`	`frameSize = BuildFrame(pFrameData, maxFrameDataSize + 10, command, pFrameData + 5, payloadSize);`