Fix accidently broken logic in previous commit: no GIF is loaded at d…

…efault, so player will keep trying to decode garbage until the timeout and a GIF is loaded
pixelmatix · Jul 6, 2020 · 751e8fc · 751e8fc
1 parent deb9468
commit 751e8fc
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 4 deletions.
diff --git a/examples/SmartMatrixGifPlayer/SmartMatrixGifPlayer.ino b/examples/SmartMatrixGifPlayer/SmartMatrixGifPlayer.ino
@@ -240,22 +240,27 @@ void setup() {
 
 void loop() {
     static unsigned long displayStartTime_millis;
+    static int nextGIF = 1;     // we haven't loaded a GIF yet on first pass through, make sure we do that
 
     unsigned long now = millis();
 
 #if (START_WITH_RANDOM_GIF == 1)
     static int index = random(num_files);
 #else
-     static int index = 0;
+    static int index = 0;
 #endif   
 
-    // default behavior is to play the gif for DISPLAY_TIME_SECONDS or for NUMBER_FULL_CYCLES, whichever comes first
 #if 1
+    // default behavior is to play the gif for DISPLAY_TIME_SECONDS or for NUMBER_FULL_CYCLES, whichever comes first
     if((now - displayStartTime_millis) > (DISPLAY_TIME_SECONDS * 1000) || decoder.getCycleNo() > NUMBER_FULL_CYCLES)
+        nextGIF = 1;
 #else
     // alt behavior is to play the gif until both DISPLAY_TIME_SECONDS and NUMBER_FULL_CYCLES have passed
     if((now - displayStartTime_millis) > (DISPLAY_TIME_SECONDS * 1000) && decoder.getCycleNo() > NUMBER_FULL_CYCLES)
+        nextGIF = 1;
 #endif
+
+    if(nextGIF)
     {
         if (openGifFilenameByIndex(GIF_DIRECTORY, index) >= 0) {
             // Can clear screen for new animation here, but this might cause flicker with short animations
@@ -272,6 +277,8 @@ void loop() {
         if (++index >= num_files) {
             index = 0;
         }
+
+        nextGIF = 0;
     }
 
     decoder.decodeFrame();

diff --git a/examples/SmartMatrixGifProfiling/SmartMatrixGifProfiling.ino b/examples/SmartMatrixGifProfiling/SmartMatrixGifProfiling.ino
@@ -239,22 +239,28 @@ void setup() {
 
 void loop() {
     static unsigned long displayStartTime_millis;
+    static int nextGIF = 1;     // we haven't loaded a GIF yet on first pass through, make sure we do that
+    static unsigned long lastDecodeTime_millis;
 
     unsigned long now = millis();
 
 #if (START_WITH_RANDOM_GIF == 1)
     static int index = random(num_files);
 #else
-     static int index = 0;
+    static int index = 0;
 #endif   
 
-    // default behavior is to play the gif for DISPLAY_TIME_SECONDS or for NUMBER_FULL_CYCLES, whichever comes first
 #if 1
+    // default behavior is to play the gif for DISPLAY_TIME_SECONDS or for NUMBER_FULL_CYCLES, whichever comes first
     if((now - displayStartTime_millis) > (DISPLAY_TIME_SECONDS * 1000) || decoder.getCycleNo() > NUMBER_FULL_CYCLES)
+        nextGIF = 1;
 #else
     // alt behavior is to play the gif until both DISPLAY_TIME_SECONDS and NUMBER_FULL_CYCLES have passed
     if((now - displayStartTime_millis) > (DISPLAY_TIME_SECONDS * 1000) && decoder.getCycleNo() > NUMBER_FULL_CYCLES)
+        nextGIF = 1;
 #endif
+
+    if(nextGIF)
     {
         if (openGifFilenameByIndex(GIF_DIRECTORY, index) >= 0) {
             // Can clear screen for new animation here, but this might cause flicker with short animations
@@ -271,6 +277,8 @@ void loop() {
         if (++index >= num_files) {
             index = 0;
         }
+
+        nextGIF = 0;
     }
 
     decoder.decodeFrame();