From 12f018c220881b7d9a34a276ed55e7fe1078f1c8 Mon Sep 17 00:00:00 2001 From: Markus Kalkbrenner Date: Sun, 19 May 2024 10:10:52 +0200 Subject: [PATCH] serum flags changed --- platforms/android/arm64-v8a/external.sh | 2 +- platforms/ios/arm64/external.sh | 2 +- platforms/linux/aarch64/external.sh | 2 +- platforms/linux/x64/external.sh | 2 +- platforms/macos/arm64/external.sh | 2 +- platforms/macos/x64/external.sh | 2 +- platforms/tvos/arm64/external.sh | 2 +- platforms/win/x64/external.sh | 2 +- platforms/win/x86/external.sh | 2 +- src/DMD.cpp | 8 ++++---- 10 files changed, 13 insertions(+), 13 deletions(-) diff --git a/platforms/android/arm64-v8a/external.sh b/platforms/android/arm64-v8a/external.sh index 3b6765f..7f25ab7 100755 --- 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=ba3868fc3723f1179205f4ee6ff78fdc58fd2d2b +LIBSERUM_SHA=ff0250e525fb2900262cef61366b40699b73f51c SOCKPP_SHA=e6c4688a576d95f42dd7628cefe68092f6c5cd0f LIBPUPDMD_SHA=c640ea2cec94097e8baefee9dab39266970e4405 LIBFRAMEUTIL_SHA=30048ca23d41ca0a8f7d5ab75d3f646a19a90182 diff --git a/platforms/ios/arm64/external.sh b/platforms/ios/arm64/external.sh index 6f26a70..b512c7f 100755 --- 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=ba3868fc3723f1179205f4ee6ff78fdc58fd2d2b +LIBSERUM_SHA=ff0250e525fb2900262cef61366b40699b73f51c SOCKPP_SHA=e6c4688a576d95f42dd7628cefe68092f6c5cd0f LIBPUPDMD_SHA=c640ea2cec94097e8baefee9dab39266970e4405 LIBFRAMEUTIL_SHA=30048ca23d41ca0a8f7d5ab75d3f646a19a90182 diff --git a/platforms/linux/aarch64/external.sh b/platforms/linux/aarch64/external.sh index 0c0483e..ec60d01 100755 --- 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=ba3868fc3723f1179205f4ee6ff78fdc58fd2d2b +LIBSERUM_SHA=ff0250e525fb2900262cef61366b40699b73f51c SOCKPP_SHA=e6c4688a576d95f42dd7628cefe68092f6c5cd0f LIBPUPDMD_SHA=c640ea2cec94097e8baefee9dab39266970e4405 LIBFRAMEUTIL_SHA=30048ca23d41ca0a8f7d5ab75d3f646a19a90182 diff --git a/platforms/linux/x64/external.sh b/platforms/linux/x64/external.sh index 325e0de..2f81abc 100755 --- 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=ba3868fc3723f1179205f4ee6ff78fdc58fd2d2b +LIBSERUM_SHA=ff0250e525fb2900262cef61366b40699b73f51c SOCKPP_SHA=e6c4688a576d95f42dd7628cefe68092f6c5cd0f LIBPUPDMD_SHA=c640ea2cec94097e8baefee9dab39266970e4405 LIBFRAMEUTIL_SHA=30048ca23d41ca0a8f7d5ab75d3f646a19a90182 diff --git a/platforms/macos/arm64/external.sh b/platforms/macos/arm64/external.sh index 46e6163..d270a72 100755 --- 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=ba3868fc3723f1179205f4ee6ff78fdc58fd2d2b +LIBSERUM_SHA=ff0250e525fb2900262cef61366b40699b73f51c SOCKPP_SHA=e6c4688a576d95f42dd7628cefe68092f6c5cd0f LIBPUPDMD_SHA=c640ea2cec94097e8baefee9dab39266970e4405 LIBFRAMEUTIL_SHA=30048ca23d41ca0a8f7d5ab75d3f646a19a90182 diff --git a/platforms/macos/x64/external.sh b/platforms/macos/x64/external.sh index f29c2a4..d968be2 100755 --- 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=ba3868fc3723f1179205f4ee6ff78fdc58fd2d2b +LIBSERUM_SHA=ff0250e525fb2900262cef61366b40699b73f51c SOCKPP_SHA=e6c4688a576d95f42dd7628cefe68092f6c5cd0f LIBPUPDMD_SHA=c640ea2cec94097e8baefee9dab39266970e4405 LIBFRAMEUTIL_SHA=30048ca23d41ca0a8f7d5ab75d3f646a19a90182 diff --git a/platforms/tvos/arm64/external.sh b/platforms/tvos/arm64/external.sh index b057605..841e02c 100755 --- 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=ba3868fc3723f1179205f4ee6ff78fdc58fd2d2b +LIBSERUM_SHA=ff0250e525fb2900262cef61366b40699b73f51c SOCKPP_SHA=e6c4688a576d95f42dd7628cefe68092f6c5cd0f LIBPUPDMD_SHA=c640ea2cec94097e8baefee9dab39266970e4405 LIBFRAMEUTIL_SHA=30048ca23d41ca0a8f7d5ab75d3f646a19a90182 diff --git a/platforms/win/x64/external.sh b/platforms/win/x64/external.sh index 01bb571..8011808 100755 --- 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=ba3868fc3723f1179205f4ee6ff78fdc58fd2d2b +LIBSERUM_SHA=ff0250e525fb2900262cef61366b40699b73f51c SOCKPP_SHA=e6c4688a576d95f42dd7628cefe68092f6c5cd0f LIBPUPDMD_SHA=c640ea2cec94097e8baefee9dab39266970e4405 LIBFRAMEUTIL_SHA=30048ca23d41ca0a8f7d5ab75d3f646a19a90182 diff --git a/platforms/win/x86/external.sh b/platforms/win/x86/external.sh index cc760ce..f89f6b1 100755 --- 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=ba3868fc3723f1179205f4ee6ff78fdc58fd2d2b +LIBSERUM_SHA=ff0250e525fb2900262cef61366b40699b73f51c SOCKPP_SHA=e6c4688a576d95f42dd7628cefe68092f6c5cd0f LIBPUPDMD_SHA=c640ea2cec94097e8baefee9dab39266970e4405 LIBFRAMEUTIL_SHA=30048ca23d41ca0a8f7d5ab75d3f646a19a90182 diff --git a/src/DMD.cpp b/src/DMD.cpp index 53bc2bd..c719b68 100644 --- a/src/DMD.cpp +++ b/src/DMD.cpp @@ -772,7 +772,7 @@ void DMD::SerumThread() dmdUpdate.hasSegData = false; dmdUpdate.hasSegData2 = false; - if (m_pSerum->flags & 4) + if (m_pSerum->flags == 0) { dmdUpdate.mode = Mode::SerumV1; dmdUpdate.depth = 6; @@ -785,7 +785,7 @@ void DMD::SerumThread() QueueUpdate(dmdUpdate, false); } - else if ((m_pSerum->flags & 1) && !(m_pSerum->flags & 2)) + else if ((m_pSerum->flags & FLAG_RETURNED_32P_FRAME_OK) && !(m_pSerum->flags & FLAG_RETURNED_64P_FRAME_OK)) { dmdUpdate.mode = Mode::SerumV2_32; dmdUpdate.depth = 24; @@ -795,7 +795,7 @@ void DMD::SerumThread() QueueUpdate(dmdUpdate, false); } - else if (!(m_pSerum->flags & 1) && (m_pSerum->flags & 2)) + else if (!(m_pSerum->flags & FLAG_RETURNED_32P_FRAME_OK) && (m_pSerum->flags & FLAG_RETURNED_64P_FRAME_OK)) { dmdUpdate.mode = Mode::SerumV2_64; dmdUpdate.depth = 24; @@ -805,7 +805,7 @@ void DMD::SerumThread() QueueUpdate(dmdUpdate, false); } - else if ((m_pSerum->flags & 1) && (m_pSerum->flags & 2)) + else if ((m_pSerum->flags & FLAG_RETURNED_32P_FRAME_OK) && (m_pSerum->flags & FLAG_RETURNED_64P_FRAME_OK)) { dmdUpdate.mode = Mode::SerumV2_32_64; dmdUpdate.depth = 24;