Support new cROMc format, color rotation fixes (#86)

Author: mkalkbrenner

CMakeLists.txt

@@ -17,7 +17,10 @@ message(STATUS "POST_BUILD_COPY_EXT_LIBS: ${POST_BUILD_COPY_EXT_LIBS}")
 message(STATUS "ENABLE_SANITIZERS: ${ENABLE_SANITIZERS}")
 
 if(PLATFORM STREQUAL "macos")
-   set(CMAKE_OSX_DEPLOYMENT_TARGET 14.0)
+   if(CMAKE_BUILD_TYPE STREQUAL "Debug")
+      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address -g")
+      set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=address -g")
+   endif()
 elseif(PLATFORM STREQUAL "ios" OR PLATFORM STREQUAL "ios-simulator")
    set(CMAKE_SYSTEM_NAME iOS)
    if (PLATFORM STREQUAL "ios-simulator")

include/DMDUtil/DMDUtil.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #define DMDUTIL_VERSION_MAJOR 0   // X Digits
-#define DMDUTIL_VERSION_MINOR 10  // Max 2 Digits
+#define DMDUTIL_VERSION_MINOR 11  // Max 2 Digits
 #define DMDUTIL_VERSION_PATCH 0   // Max 2 Digits
 
 #define _DMDUTIL_STR(x) #x

platforms/config.sh

@@ -2,8 +2,8 @@
 
 set -e
 
-LIBZEDMD_SHA=ab59ccf67bdded2fe88a3f14368a2b4d7fe8a4c6
-LIBSERUM_SHA=ecf1fb6e9e0464593646150ca82ef6d5f177a113
+LIBZEDMD_SHA=41c84011247dd55650b711e8680ae7088a86b822
+LIBSERUM_SHA=1fe1713322252463386aa4b68159f10d0fae881b
 LIBPUPDMD_SHA=124f45e5ddd59ceb339591de88fcca72f8c54612
 
 if [ -z "${BUILD_TYPE}" ]; then

src/DMD.cpp

@@ -1014,7 +1014,7 @@ void DMD::SerumThread()
           {
             uint32_t result = Serum_Colorize(m_pUpdateBufferQueue[bufferPositionMod]->data);
 
-            if (result != IDENTIFY_NO_FRAME)
+            if (result != IDENTIFY_NO_FRAME && result != IDENTIFY_SAME_FRAME)
             {
               // Log(DMDUtil_LogLevel_DEBUG, "Serum: frameID=%lu, rotation=%lu, flags=%lu", m_pSerum->frameID,
               // m_pSerum->rotationtimer, m_pSerum->flags);
@@ -1024,7 +1024,11 @@ void DMD::SerumThread()
               QueueSerumFrames(lastDmdUpdate, flags & FLAG_REQUEST_32P_FRAMES, flags & FLAG_REQUEST_64P_FRAMES);
 
               if (result > 0 && ((result & 0xffff) < 2048))
+              {
                 nextRotation = now + m_pSerum->rotationtimer;
+                if (result & 0x40000) Log(DMDUtil_LogLevel_DEBUG, "Serum: starting scene rotation, timer=%lu",
+                                          m_pSerum->rotationtimer);
+              }
               else
                 nextRotation = 0;
 
@@ -1058,11 +1062,11 @@ void DMD::SerumThread()
 
       if (m_pSerum)
       {
-        if (nextRotation > 0 && m_pSerum->rotationtimer > 0 && lastDmdUpdate && now > nextRotation)
+        if (nextRotation > 0 && m_pSerum->rotationtimer > 0 && lastDmdUpdate && now >= nextRotation)
         {
           uint32_t result = Serum_Rotate();
 
-          // Log(DMDUtil_LogLevel_DEBUG, "Serum: rotation=%lu, flags=%lu", m_pSerum->rotationtimer, result >> 16);
+          Log(DMDUtil_LogLevel_DEBUG, "Serum: rotation=%lu, flags=%lu", m_pSerum->rotationtimer, result >> 16);
 
           QueueSerumFrames(lastDmdUpdate, result & 0x10000, result & 0x20000);