Merge pull request #394 from MartinMueller2003/main

Fixed channel ID in the file player definition that caused an incorrect blank timer to get started.
forkineye · Oct 16, 2021 · 854ae20 · 854ae20
2 parents 9c35ad0 + cbfe200
commit 854ae20
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 2 deletions.
diff --git a/ESPixelStick/src/input/InputFPPRemote.cpp b/ESPixelStick/src/input/InputFPPRemote.cpp
@@ -108,11 +108,12 @@ void c_InputFPPRemote::Process ()
     // DEBUG_START;
     if (!IsInputChannelActive)
     {
-        // dont do anything if the channel is not active
+        // DEBUG_V ("dont do anything if the channel is not active");
         StopPlaying ();
     }
     else if (PlayingFile ())
     {
+        // DEBUG_V ("Local File Play");
         pInputFPPRemotePlayItem->Poll (InputDataBuffer, InputDataBufferSize);
 
         if (pInputFPPRemotePlayItem->IsIdle ())
@@ -123,6 +124,7 @@ void c_InputFPPRemote::Process ()
     }
     else
     {
+        // DEBUG_V ();
         FPPDiscovery.ReadNextFrame (InputDataBuffer, InputDataBufferSize);
     }
 

diff --git a/ESPixelStick/src/input/InputFPPRemotePlayFileFsm.cpp b/ESPixelStick/src/input/InputFPPRemotePlayFileFsm.cpp
@@ -254,6 +254,7 @@ void fsm_PlayFile_state_PlayingFile::Poll (uint8_t* Buffer, size_t BufferSize)
         // DEBUG_V (String ("ChannelsPerFrame: ") + String (p_InputFPPRemotePlayFile->ChannelsPerFrame));
         // DEBUG_V (String ("    FilePosition: ") + String (FilePosition));
         // DEBUG_V (String ("  MaxBytesToRead: ") + String (MaxBytesToRead));
+        // DEBUG_V (String ("GetInputChannelId: ") + String (p_InputFPPRemotePlayFile->GetInputChannelId ()));
 
         InputMgr.RestartBlankTimer (p_InputFPPRemotePlayFile->GetInputChannelId ());
 

diff --git a/ESPixelStick/src/input/InputMgr.cpp b/ESPixelStick/src/input/InputMgr.cpp
@@ -634,6 +634,7 @@ void c_InputMgr::Process ()
 
             if (!BlankTimerHasExpired (CurrentInput->GetInputChannelId()))
             {
+                // DEBUG_V (String ("Blank Timer is running: ") + String (CurrentInput->GetInputChannelId ()));
                 aBlankTimerIsRunning = true;
                 break;
             }

diff --git a/ESPixelStick/src/service/FPPDiscovery.h b/ESPixelStick/src/service/FPPDiscovery.h
@@ -50,7 +50,7 @@ class c_FPPDiscovery
     bool IsEnabled = false;
     String UploadFileName;
     IPAddress FppRemoteIp = IPAddress (uint32_t(0));
-    c_InputFPPRemotePlayFile InputFPPRemotePlayFile = c_InputFPPRemotePlayFile (c_InputMgr::e_InputChannelIds::InputPrimaryChannelId);
+    c_InputFPPRemotePlayFile InputFPPRemotePlayFile = c_InputFPPRemotePlayFile (c_InputMgr::e_InputChannelIds::InputSecondaryChannelId);
 
     void GetSysInfoJSON    (JsonObject& jsonResponse);
     void BuildFseqResponse (String fname, c_FileMgr::FileId fseq, String & resp);