From bef983ccb1d8eedb1152360a9ab46805231760ae Mon Sep 17 00:00:00 2001 From: Martin Mueller Date: Sat, 16 Oct 2021 00:10:29 -0400 Subject: [PATCH 1/4] Added debug statements. --- ESPixelStick/src/input/InputFPPRemote.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ESPixelStick/src/input/InputFPPRemote.cpp b/ESPixelStick/src/input/InputFPPRemote.cpp index 65efd6e37..bc7da0933 100644 --- 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); } From ee3b0a6b3f866a1c195b17d4f35af0e989d61646 Mon Sep 17 00:00:00 2001 From: Martin Mueller Date: Sat, 16 Oct 2021 00:12:11 -0400 Subject: [PATCH 2/4] Added a debug message --- ESPixelStick/src/input/InputMgr.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/ESPixelStick/src/input/InputMgr.cpp b/ESPixelStick/src/input/InputMgr.cpp index e0abdc889..d16f34460 100644 --- 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; } From 3b5327684a3a39fa984589aee8715b77132d13bd Mon Sep 17 00:00:00 2001 From: Martin Mueller Date: Sat, 16 Oct 2021 00:13:09 -0400 Subject: [PATCH 3/4] Added a debug statement --- ESPixelStick/src/input/InputFPPRemotePlayFileFsm.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/ESPixelStick/src/input/InputFPPRemotePlayFileFsm.cpp b/ESPixelStick/src/input/InputFPPRemotePlayFileFsm.cpp index 943934269..0ef854000 100644 --- 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 ()); From cbfe2001d56d3a91f6f5969e61041ff78193af72 Mon Sep 17 00:00:00 2001 From: Martin Mueller Date: Sat, 16 Oct 2021 00:15:05 -0400 Subject: [PATCH 4/4] Fixed channel ID in the file player definition that caused an incorrect blank timer to get started. --- ESPixelStick/src/service/FPPDiscovery.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ESPixelStick/src/service/FPPDiscovery.h b/ESPixelStick/src/service/FPPDiscovery.h index 8f49a9e1c..2be3443d3 100644 --- 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);