Skip to content

use libserum v2.2.0-concentrate.5 #78

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mkalkbrenner merged 6 commits into from
Jun 12, 2025
Merged

use libserum v2.2.0-concentrate.5 #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1d5ac77
use libserum v2.2.0-concentrate.5
mkalkbrenner Jun 10, 2025
666eb49
added AddRGB24DMD() to allow setting an "external" DMD
mkalkbrenner Jun 10, 2025
a602a05
allow derived RGB24DMDs
mkalkbrenner Jun 10, 2025
2929d4e
added log info aboput RGB24DMD thread
mkalkbrenner Jun 10, 2025
70c1d7b
const
mkalkbrenner Jun 10, 2025
a8e3585
added log
mkalkbrenner Jun 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions include/DMDUtil/DMD.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,7 @@ class DMDUTILAPI DMD
void DumpDMDRaw();
LevelDMD* CreateLevelDMD(uint16_t width, uint16_t height, bool sam);
bool DestroyLevelDMD(LevelDMD* pLevelDMD);
void AddRGB24DMD(RGB24DMD* pRGB24DMD);
RGB24DMD* CreateRGB24DMD(uint16_t width, uint16_t height);
bool DestroyRGB24DMD(RGB24DMD* pRGB24DMD);
ConsoleDMD* CreateConsoleDMD(bool overwrite, FILE* out = stdout);
Expand Down
2 changes: 1 addition & 1 deletion include/DMDUtil/DMDUtil.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

#define DMDUTIL_VERSION_MAJOR 0 // X Digits
#define DMDUTIL_VERSION_MINOR 9 // Max 2 Digits
#define DMDUTIL_VERSION_PATCH 1 // Max 2 Digits
#define DMDUTIL_VERSION_PATCH 2 // Max 2 Digits

#define _DMDUTIL_STR(x) #x
#define DMDUTIL_STR(x) _DMDUTIL_STR(x)
Expand Down
4 changes: 2 additions & 2 deletions include/DMDUtil/RGB24DMD.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@ class DMDUTILAPI RGB24DMD
RGB24DMD(uint16_t width, uint16_t height);
~RGB24DMD();

void Update(uint8_t* pRGB24Data);
virtual void Update(uint8_t* pRGB24Data);
int GetWidth() const { return m_width; }
int GetHeight() const { return m_height; }
int GetLength() const { return m_length; }
int GetPitch() const { return m_pitch; }
uint8_t* GetData();

private:
protected:
uint16_t m_width;
uint16_t m_height;
int m_length;
Expand Down
2 changes: 1 addition & 1 deletion platforms/config.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
set -e

LIBZEDMD_SHA=154772800e8f36378c629f066bfee563862728ac
LIBSERUM_SHA=9e071b9b0062352476786ff578368c7dc019ac07
LIBSERUM_SHA=607bee2ab6e73a08a28f207a42be676e967cf876
LIBPUPDMD_SHA=124f45e5ddd59ceb339591de88fcca72f8c54612

if [ -z "${BUILD_TYPE}" ]; then
Expand Down
13 changes: 11 additions & 2 deletions src/DMD.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,11 +280,20 @@ bool DMD::DestroyLevelDMD(LevelDMD* pLevelDMD)
return false;
}

void DMD::AddRGB24DMD(RGB24DMD* pRGB24DMD)
{
m_rgb24DMDs.push_back(pRGB24DMD);
Log(DMDUtil_LogLevel_INFO, "Added RGB24DMD");
if (!m_pRGB24DMDThread) {
m_pRGB24DMDThread = new std::thread(&DMD::RGB24DMDThread, this);
Log(DMDUtil_LogLevel_INFO, "RGB24DMDThread started");
}
}

RGB24DMD* DMD::CreateRGB24DMD(uint16_t width, uint16_t height)
{
RGB24DMD* const pRGB24DMD = new RGB24DMD(width, height);
m_rgb24DMDs.push_back(pRGB24DMD);
if (!m_pRGB24DMDThread) m_pRGB24DMDThread = new std::thread(&DMD::RGB24DMDThread, this);
AddRGB24DMD(pRGB24DMD);
return pRGB24DMD;
}

Expand Down