fixed serum result type

vpinball · May 18, 2024 · 082a29f · 082a29f
1 parent 5b55c51
commit 082a29f
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 11 deletions.
diff --git a/platforms/android/arm64-v8a/external.sh b/platforms/android/arm64-v8a/external.sh
@@ -4,7 +4,7 @@ set -e
 
 CARGS_SHA=5949a20a926e902931de4a32adaad9f19c76f251
 LIBZEDMD_SHA=6395357ce400036432587b4f696a2fac14ddd21a
-LIBSERUM_SHA=3a313cb7851b21631ef56193a441903a2e90df43
+LIBSERUM_SHA=ba3868fc3723f1179205f4ee6ff78fdc58fd2d2b
 SOCKPP_SHA=e6c4688a576d95f42dd7628cefe68092f6c5cd0f
 LIBPUPDMD_SHA=c640ea2cec94097e8baefee9dab39266970e4405
 LIBFRAMEUTIL_SHA=30048ca23d41ca0a8f7d5ab75d3f646a19a90182

diff --git a/platforms/ios/arm64/external.sh b/platforms/ios/arm64/external.sh
@@ -4,7 +4,7 @@ set -e
 
 CARGS_SHA=5949a20a926e902931de4a32adaad9f19c76f251
 LIBZEDMD_SHA=6395357ce400036432587b4f696a2fac14ddd21a
-LIBSERUM_SHA=3a313cb7851b21631ef56193a441903a2e90df43
+LIBSERUM_SHA=ba3868fc3723f1179205f4ee6ff78fdc58fd2d2b
 SOCKPP_SHA=e6c4688a576d95f42dd7628cefe68092f6c5cd0f
 LIBPUPDMD_SHA=c640ea2cec94097e8baefee9dab39266970e4405
 LIBFRAMEUTIL_SHA=30048ca23d41ca0a8f7d5ab75d3f646a19a90182

diff --git a/platforms/linux/aarch64/external.sh b/platforms/linux/aarch64/external.sh
@@ -4,7 +4,7 @@ set -e
 
 CARGS_SHA=5949a20a926e902931de4a32adaad9f19c76f251
 LIBZEDMD_SHA=6395357ce400036432587b4f696a2fac14ddd21a
-LIBSERUM_SHA=3a313cb7851b21631ef56193a441903a2e90df43
+LIBSERUM_SHA=ba3868fc3723f1179205f4ee6ff78fdc58fd2d2b
 SOCKPP_SHA=e6c4688a576d95f42dd7628cefe68092f6c5cd0f
 LIBPUPDMD_SHA=c640ea2cec94097e8baefee9dab39266970e4405
 LIBFRAMEUTIL_SHA=30048ca23d41ca0a8f7d5ab75d3f646a19a90182

diff --git a/platforms/linux/x64/external.sh b/platforms/linux/x64/external.sh
@@ -4,7 +4,7 @@ set -e
 
 CARGS_SHA=5949a20a926e902931de4a32adaad9f19c76f251
 LIBZEDMD_SHA=6395357ce400036432587b4f696a2fac14ddd21a
-LIBSERUM_SHA=3a313cb7851b21631ef56193a441903a2e90df43
+LIBSERUM_SHA=ba3868fc3723f1179205f4ee6ff78fdc58fd2d2b
 SOCKPP_SHA=e6c4688a576d95f42dd7628cefe68092f6c5cd0f
 LIBPUPDMD_SHA=c640ea2cec94097e8baefee9dab39266970e4405
 LIBFRAMEUTIL_SHA=30048ca23d41ca0a8f7d5ab75d3f646a19a90182

diff --git a/platforms/macos/arm64/external.sh b/platforms/macos/arm64/external.sh
@@ -4,7 +4,7 @@ set -e
 
 CARGS_SHA=5949a20a926e902931de4a32adaad9f19c76f251
 LIBZEDMD_SHA=6395357ce400036432587b4f696a2fac14ddd21a
-LIBSERUM_SHA=3a313cb7851b21631ef56193a441903a2e90df43
+LIBSERUM_SHA=ba3868fc3723f1179205f4ee6ff78fdc58fd2d2b
 SOCKPP_SHA=e6c4688a576d95f42dd7628cefe68092f6c5cd0f
 LIBPUPDMD_SHA=c640ea2cec94097e8baefee9dab39266970e4405
 LIBFRAMEUTIL_SHA=30048ca23d41ca0a8f7d5ab75d3f646a19a90182

diff --git a/platforms/macos/x64/external.sh b/platforms/macos/x64/external.sh
@@ -4,7 +4,7 @@ set -e
 
 CARGS_SHA=5949a20a926e902931de4a32adaad9f19c76f251
 LIBZEDMD_SHA=6395357ce400036432587b4f696a2fac14ddd21a
-LIBSERUM_SHA=3a313cb7851b21631ef56193a441903a2e90df43
+LIBSERUM_SHA=ba3868fc3723f1179205f4ee6ff78fdc58fd2d2b
 SOCKPP_SHA=e6c4688a576d95f42dd7628cefe68092f6c5cd0f
 LIBPUPDMD_SHA=c640ea2cec94097e8baefee9dab39266970e4405
 LIBFRAMEUTIL_SHA=30048ca23d41ca0a8f7d5ab75d3f646a19a90182

diff --git a/platforms/tvos/arm64/external.sh b/platforms/tvos/arm64/external.sh
@@ -4,7 +4,7 @@ set -e
 
 CARGS_SHA=5949a20a926e902931de4a32adaad9f19c76f251
 LIBZEDMD_SHA=6395357ce400036432587b4f696a2fac14ddd21a
-LIBSERUM_SHA=3a313cb7851b21631ef56193a441903a2e90df43
+LIBSERUM_SHA=ba3868fc3723f1179205f4ee6ff78fdc58fd2d2b
 SOCKPP_SHA=e6c4688a576d95f42dd7628cefe68092f6c5cd0f
 LIBPUPDMD_SHA=c640ea2cec94097e8baefee9dab39266970e4405
 LIBFRAMEUTIL_SHA=30048ca23d41ca0a8f7d5ab75d3f646a19a90182

diff --git a/platforms/win/x64/external.sh b/platforms/win/x64/external.sh
@@ -4,7 +4,7 @@ set -e
 
 CARGS_SHA=5949a20a926e902931de4a32adaad9f19c76f251
 LIBZEDMD_SHA=6395357ce400036432587b4f696a2fac14ddd21a
-LIBSERUM_SHA=3a313cb7851b21631ef56193a441903a2e90df43
+LIBSERUM_SHA=ba3868fc3723f1179205f4ee6ff78fdc58fd2d2b
 SOCKPP_SHA=e6c4688a576d95f42dd7628cefe68092f6c5cd0f
 LIBPUPDMD_SHA=c640ea2cec94097e8baefee9dab39266970e4405
 LIBFRAMEUTIL_SHA=30048ca23d41ca0a8f7d5ab75d3f646a19a90182

diff --git a/platforms/win/x86/external.sh b/platforms/win/x86/external.sh
@@ -4,7 +4,7 @@ set -e
 
 CARGS_SHA=5949a20a926e902931de4a32adaad9f19c76f251
 LIBZEDMD_SHA=6395357ce400036432587b4f696a2fac14ddd21a
-LIBSERUM_SHA=3a313cb7851b21631ef56193a441903a2e90df43
+LIBSERUM_SHA=ba3868fc3723f1179205f4ee6ff78fdc58fd2d2b
 SOCKPP_SHA=e6c4688a576d95f42dd7628cefe68092f6c5cd0f
 LIBPUPDMD_SHA=c640ea2cec94097e8baefee9dab39266970e4405
 LIBFRAMEUTIL_SHA=30048ca23d41ca0a8f7d5ab75d3f646a19a90182

diff --git a/src/DMD.cpp b/src/DMD.cpp
@@ -763,7 +763,7 @@ void DMD::SerumThread()
 
         if (m_pSerum && m_pUpdateBufferQueue[currentBufferPosition]->mode == Mode::Data)
         {
-          uint8_t result = Serum_Colorize(m_pUpdateBufferQueue[currentBufferPosition]->data);
+          uint32_t result = Serum_Colorize(m_pUpdateBufferQueue[currentBufferPosition]->data);
 
           if (result != 0xffffffff)
           {
@@ -828,7 +828,7 @@ void DMD::SerumThread()
               // @todo rotation timer
             }
 
-            if (m_pSerum->triggerID > 0 && m_pSerum->triggerID != prevTriggerId)
+            if (m_pSerum->triggerID < 0xffffffff & m_pSerum->triggerID != prevTriggerId)
             {
               HandleTrigger(m_pSerum->triggerID);
               prevTriggerId = m_pSerum->triggerID;