From 08162480126e1f332816c87da3133641c894521f Mon Sep 17 00:00:00 2001
From: Martin Mueller <MartinMueller2003@yahoo.com>
Date: Tue, 26 Oct 2021 11:14:02 -0400
Subject: [PATCH 1/5] Added SD Stats to file response

---
 ESPixelStick/src/FileMgr.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/ESPixelStick/src/FileMgr.cpp b/ESPixelStick/src/FileMgr.cpp
index 9c1cbd01f..0ba85b667 100644
--- a/ESPixelStick/src/FileMgr.cpp
+++ b/ESPixelStick/src/FileMgr.cpp
@@ -606,6 +606,15 @@ void c_FileMgr::GetListOfSdFiles (String & Response)
             break;
         }
 
+        FSInfo fs_info;
+        SDFS.info (fs_info);
+        ResponseJsonDoc[F ("totalBytes")]    = fs_info.totalBytes;
+        ResponseJsonDoc[F ("usedBytes")]     = fs_info.usedBytes;
+        ResponseJsonDoc[F ("blockSize")]     = fs_info.blockSize;
+        ResponseJsonDoc[F ("pageSize")]      = fs_info.pageSize;
+        ResponseJsonDoc[F ("maxOpenFiles")]  = fs_info.maxOpenFiles;
+        ResponseJsonDoc[F ("maxPathLength")] = fs_info.maxPathLength;
+
         File dir = SDFS.open ("/", CN_r);
 
         while (true)

From 109d6f6d4c32d79597ebf3cda9199417eca12f17 Mon Sep 17 00:00:00 2001
From: Martin Mueller <MartinMueller2003@yahoo.com>
Date: Tue, 26 Oct 2021 13:44:48 -0400
Subject: [PATCH 2/5] Added UI display for SD Size and Remaining Size in MB

---
 ESPixelStick/src/FileMgr.cpp | 14 ++++++++------
 html/index.html              | 14 ++++++++++++++
 html/script.js               | 10 ++++++++++
 3 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/ESPixelStick/src/FileMgr.cpp b/ESPixelStick/src/FileMgr.cpp
index 0ba85b667..ed056a05c 100644
--- a/ESPixelStick/src/FileMgr.cpp
+++ b/ESPixelStick/src/FileMgr.cpp
@@ -606,15 +606,17 @@ void c_FileMgr::GetListOfSdFiles (String & Response)
             break;
         }
 
+#ifdef ARDUINO_ARCH_ESP32
+        ResponseJsonDoc[F ("totalBytes")]     = SDFS.totalBytes ();
+        ResponseJsonDoc[F ("usedBytes")]      = SDFS.usedBytes ();
+
+#else
         FSInfo fs_info;
         SDFS.info (fs_info);
-        ResponseJsonDoc[F ("totalBytes")]    = fs_info.totalBytes;
-        ResponseJsonDoc[F ("usedBytes")]     = fs_info.usedBytes;
-        ResponseJsonDoc[F ("blockSize")]     = fs_info.blockSize;
-        ResponseJsonDoc[F ("pageSize")]      = fs_info.pageSize;
-        ResponseJsonDoc[F ("maxOpenFiles")]  = fs_info.maxOpenFiles;
-        ResponseJsonDoc[F ("maxPathLength")] = fs_info.maxPathLength;
+        ResponseJsonDoc[F ("totalBytes")]     = fs_info.totalBytes;
+        ResponseJsonDoc[F ("usedBytes")]      = fs_info.usedBytes;
 
+#endif
         File dir = SDFS.open ("/", CN_r);
 
         while (true)
diff --git a/html/index.html b/html/index.html
index aed5df2d4..9ff6ae2ff 100644
--- a/html/index.html
+++ b/html/index.html
@@ -349,6 +349,20 @@
                         <a id="FileDeleteButton" class="button">Remove Selected File(s)</a>
                         <!-- <a id="FileUploadButton" class="button">Upload Selected File(s)</a> -->
                     </div>
+                    <div>
+                        <div>
+                            <label class="control-label col-sm-2" for="totalBytes">SD Size (MB):</label>
+                            <output class="form-control" id="totalBytes" type="number"></output>
+                        </div>
+                        <div>
+                            <label class="control-label col-sm-2" for="usedBytes">Used SD Size (MB):</label>
+                            <output class="form-control" id="usedBytes" type="number"></output>
+                        </div>
+                        <div>
+                            <label class="control-label col-sm-2" for="remainingBytes">Remaining SD Size (MB):</label>
+                            <output class="form-control" id="remainingBytes" type="number"></output>
+                        </div>
+                    </div>
                     <div>
                         <fieldset>
                             <legend class="esps-legend">Files</legend>
diff --git a/html/script.js b/html/script.js
index c96549e11..a2cea61d6 100644
--- a/html/script.js
+++ b/html/script.js
@@ -377,6 +377,12 @@ function RequestListOfFiles()
 
 } // RequestListOfFiles
 
+function BytesToMB(Value)
+{
+    return (Value / (1024 * 1024)).toFixed();
+
+} // BytesToMB
+
 function ProcessGetFileListResponse(JsonConfigData)
 {
     // console.info("ProcessGetFileListResponse");
@@ -389,6 +395,10 @@ function ProcessGetFileListResponse(JsonConfigData)
         $("#li-filemanagement").addClass("hidden");
     }
 
+    $("#totalBytes").val(BytesToMB (JsonConfigData.totalBytes));
+    $("#usedBytes").val(BytesToMB (JsonConfigData.usedBytes));
+    $("#remainingBytes").val(BytesToMB (JsonConfigData.totalBytes - JsonConfigData.usedBytes) );
+
     Fseq_File_List = JsonConfigData;
 
     clearTimeout(FseqFileListRequestTimer);

From d96f3663043c8e16e31c0e2632a5f18f82eaf033 Mon Sep 17 00:00:00 2001
From: Martin Mueller <MartinMueller2003@yahoo.com>
Date: Tue, 26 Oct 2021 14:28:20 -0400
Subject: [PATCH 3/5] Fixed alignment issues with SD info

---
 html/index.html | 23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/html/index.html b/html/index.html
index 9ff6ae2ff..96f516834 100644
--- a/html/index.html
+++ b/html/index.html
@@ -345,24 +345,19 @@
             <div id="filemanagement" class="mdiv hidden anchor">
                 <fieldset>
                     <legend class="esps-legend">File Management</legend>
+                    <form>
+                        <label class="control-label col-sm-2" for="totalBytes">SD Size (MB):</label>
+                        <output id="totalBytes"></output>
+                        <label class="control-label col-sm-2" for="usedBytes">SD Used (MB):</label>
+                        <output id="usedBytes"></output>
+                        <label class="control-label col-sm-2" for="remainingBytes">SD Remaining (MB):</label>
+                        <output id="remainingBytes"></output>
+                    </form>
+                    <br />
                     <div>
                         <a id="FileDeleteButton" class="button">Remove Selected File(s)</a>
                         <!-- <a id="FileUploadButton" class="button">Upload Selected File(s)</a> -->
                     </div>
-                    <div>
-                        <div>
-                            <label class="control-label col-sm-2" for="totalBytes">SD Size (MB):</label>
-                            <output class="form-control" id="totalBytes" type="number"></output>
-                        </div>
-                        <div>
-                            <label class="control-label col-sm-2" for="usedBytes">Used SD Size (MB):</label>
-                            <output class="form-control" id="usedBytes" type="number"></output>
-                        </div>
-                        <div>
-                            <label class="control-label col-sm-2" for="remainingBytes">Remaining SD Size (MB):</label>
-                            <output class="form-control" id="remainingBytes" type="number"></output>
-                        </div>
-                    </div>
                     <div>
                         <fieldset>
                             <legend class="esps-legend">Files</legend>

From cd12ba2648cf2345c19d2b4e2d6313dddc9dce72 Mon Sep 17 00:00:00 2001
From: Martin Mueller <MartinMueller2003@yahoo.com>
Date: Tue, 26 Oct 2021 15:12:36 -0400
Subject: [PATCH 4/5] Worked around a bug/crash in the ESP8266 implementation
 of populating the fs_info structure.

---
 ESPixelStick/src/FileMgr.cpp | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/ESPixelStick/src/FileMgr.cpp b/ESPixelStick/src/FileMgr.cpp
index ed056a05c..5a4d90913 100644
--- a/ESPixelStick/src/FileMgr.cpp
+++ b/ESPixelStick/src/FileMgr.cpp
@@ -607,16 +607,12 @@ void c_FileMgr::GetListOfSdFiles (String & Response)
         }
 
 #ifdef ARDUINO_ARCH_ESP32
-        ResponseJsonDoc[F ("totalBytes")]     = SDFS.totalBytes ();
-        ResponseJsonDoc[F ("usedBytes")]      = SDFS.usedBytes ();
-
+        ResponseJsonDoc[F ("totalBytes")] = SD.cardSize ();
 #else
-        FSInfo fs_info;
-        SDFS.info (fs_info);
-        ResponseJsonDoc[F ("totalBytes")]     = fs_info.totalBytes;
-        ResponseJsonDoc[F ("usedBytes")]      = fs_info.usedBytes;
-
+        ResponseJsonDoc[F ("totalBytes")] = SD.size64 ();
 #endif
+        uint64_t usedBytes = 0;
+
         File dir = SDFS.open ("/", CN_r);
 
         while (true)
@@ -629,6 +625,8 @@ void c_FileMgr::GetListOfSdFiles (String & Response)
                 break;
             }
 
+            usedBytes += entry.size ();
+
             String EntryName = String (entry.name ());
             EntryName = EntryName.substring ((('/' == EntryName[0]) ? 1 : 0));
             // DEBUG_V ("EntryName: " + EntryName);
@@ -650,10 +648,12 @@ void c_FileMgr::GetListOfSdFiles (String & Response)
             entry.close ();
         }
 
+        ResponseJsonDoc[F ("usedBytes")] = usedBytes;
+
     } while (false);
 
     serializeJson (ResponseJsonDoc, Response);
-    // DEBUG_V (Response);
+    // DEBUG_V (String ("Response: ") + Response);
 
     // DEBUG_END;
 

From 0dfa9c42ed27516c01bfc656170914fa02bc91dd Mon Sep 17 00:00:00 2001
From: Martin Mueller <MartinMueller2003@yahoo.com>
Date: Tue, 26 Oct 2021 22:09:23 -0400
Subject: [PATCH 5/5] Removed support for dynamic frame time adjustment. No
 longer needed with the interrupt based transmit function.

---
 .../src/input/InputFPPRemotePlayFile.cpp      | 96 +------------------
 .../src/input/InputFPPRemotePlayFile.hpp      | 11 +--
 .../src/input/InputFPPRemotePlayFileFsm.cpp   |  1 -
 html/index.html                               |  1 -
 html/script.js                                |  1 -
 5 files changed, 4 insertions(+), 106 deletions(-)

diff --git a/ESPixelStick/src/input/InputFPPRemotePlayFile.cpp b/ESPixelStick/src/input/InputFPPRemotePlayFile.cpp
index 70186b934..0cf81917c 100644
--- a/ESPixelStick/src/input/InputFPPRemotePlayFile.cpp
+++ b/ESPixelStick/src/input/InputFPPRemotePlayFile.cpp
@@ -99,7 +99,6 @@ void c_InputFPPRemotePlayFile::Poll (uint8_t * _Buffer, size_t _BufferSize)
     Buffer = _Buffer;
     BufferSize = _BufferSize;
 
-    InitTimeCorrectionFactor ();
     pCurrentFsmState->Poll ();
 
     // Show that we have received a poll
@@ -140,9 +139,7 @@ void c_InputFPPRemotePlayFile::GetStatus (JsonObject& JsonStatus)
 {
     // xDEBUG_START;
 
-    // uint32_t mseconds = millis () - StartTimeMS;
-    time_t   AdjustedFrameStepTimeMS = time_t (float (FrameControl.FrameStepTimeMS) * SyncControl.TimeCorrectionFactor);
-    uint32_t mseconds = AdjustedFrameStepTimeMS * FrameControl.LastPlayedFrameId;
+    uint32_t mseconds = FrameControl.FrameStepTimeMS * FrameControl.LastPlayedFrameId;
     uint32_t msecondsTotal = FrameControl.FrameStepTimeMS * FrameControl.TotalNumberOfFramesInSequence;
 
     uint32_t secs = mseconds / 1000;
@@ -150,7 +147,6 @@ void c_InputFPPRemotePlayFile::GetStatus (JsonObject& JsonStatus)
 
     JsonStatus[F ("SyncCount")]           = SyncControl.SyncCount;
     JsonStatus[F ("SyncAdjustmentCount")] = SyncControl.SyncAdjustmentCount;
-    JsonStatus[F ("TimeOffset")]          = SyncControl.TimeCorrectionFactor;
 
     String temp = GetFileName ();
 
@@ -202,7 +198,7 @@ uint32_t c_InputFPPRemotePlayFile::CalculateFrameId (int32_t SyncOffsetMS)
             break;
         }
 
-        CurrentFrameId = (AdjustedPlayTime / SyncControl.AdjustedFrameStepTimeMS);
+        CurrentFrameId = (AdjustedPlayTime / FrameControl.FrameStepTimeMS);
         // DEBUG_V (String ("  CurrentFrameId: ") + String (CurrentFrameId));
 
     } while (false);
@@ -218,10 +214,9 @@ void c_InputFPPRemotePlayFile::CalculatePlayStartTime (uint32_t StartingFrameId)
 {
     // DEBUG_START;
 
-    FrameControl.ElapsedPlayTimeMS = uint32_t ((float (FrameControl.FrameStepTimeMS) * SyncControl.TimeCorrectionFactor) * float (StartingFrameId));
+    FrameControl.ElapsedPlayTimeMS = FrameControl.FrameStepTimeMS * StartingFrameId;
     
     // DEBUG_V (String ("     FrameStepTimeMS: ") + String (FrameControl.FrameStepTimeMS));
-    // DEBUG_V (String ("TimeCorrectionFactor: ") + String (SyncControl.TimeCorrectionFactor));
     // DEBUG_V (String ("     StartingFrameId: ") + String (StartingFrameId));
     // DEBUG_V (String ("     ElapsedPlayTIme: ") + String (FrameControl.ElapsedPlayTimeMS));
 
@@ -314,7 +309,6 @@ bool c_InputFPPRemotePlayFile::ParseFseqFile ()
 
         FrameControl.FrameStepTimeMS = max ((uint8_t)25, fsqParsedHeader.stepTime);
         FrameControl.TotalNumberOfFramesInSequence = fsqParsedHeader.TotalNumberOfFramesInSequence;
-        SyncControl.AdjustedFrameStepTimeMS = uint32_t (float (FrameControl.FrameStepTimeMS) * SyncControl.TimeCorrectionFactor);
 
         FrameControl.DataOffset = fsqParsedHeader.dataOffset;
         FrameControl.ChannelsPerFrame = fsqParsedHeader.channelCount;
@@ -410,90 +404,6 @@ bool c_InputFPPRemotePlayFile::ParseFseqFile ()
 
 } // ParseFseqFile
 
-//-----------------------------------------------------------------------------
-void c_InputFPPRemotePlayFile::InitTimeCorrectionFactor ()
-{
-    // DEBUG_START;
-
-    do // once
-    {
-        if (INVALID_TIME_CORRECTION_FACTOR != SyncControl.SavedTimeCorrectionFactor)
-        {
-            break;
-        }
-
-        // only do this once after boot.
-        SyncControl.TimeCorrectionFactor = SyncControl.SavedTimeCorrectionFactor = INITIAL_TIME_CORRECTION_FACTOR;
-
-        String FileData;
-        FileMgr.ReadSdFile (String (CN_time), FileData);
-
-        if (0 == FileData.length ())
-        {
-            // DEBUG_V ("No data in file");
-            break;
-        }
-
-        // DEBUG_V (String ("FileData: ") + FileData);
-
-        DynamicJsonDocument jsonDoc (64);
-        DeserializationError error = deserializeJson (jsonDoc, FileData);
-        if (error)
-        {
-            logcon (CN_Heap_colon + String (ESP.getFreeHeap ()));
-            logcon (String (F ("Time Factor Deserialzation Error. Error code = ")) + error.c_str ());
-        }
-        // DEBUG_V ("");
-
-        JsonObject JsonData = jsonDoc.as<JsonObject> ();
-
-        // extern void PrettyPrint (JsonObject & jsonStuff, String Name);
-        // PrettyPrint (JsonData, String ("InitTimeCorrectionFactor"));
-
-        setFromJSON (SyncControl.TimeCorrectionFactor, JsonData, CN_time);
-        SyncControl.SavedTimeCorrectionFactor = SyncControl.TimeCorrectionFactor;
-        // DEBUG_V (String ("TimeCorrectionFactor: ") + String (TimeCorrectionFactor, 10));
-    
-    } while (false);
-
-    // DEBUG_END;
-
-} // InitTimeCorrectionFactor
-
-//-----------------------------------------------------------------------------
-void c_InputFPPRemotePlayFile::SaveTimeCorrectionFactor ()
-{
-    // DEBUG_START;
-
-    do // once
-    {
-        if (fabs (SyncControl.SavedTimeCorrectionFactor - SyncControl.TimeCorrectionFactor) < 0.000005F )
-        {
-            // DEBUG_V ("Nothing to save");
-            break;
-        }
-
-        DynamicJsonDocument jsonDoc (64);
-        JsonObject JsonData = jsonDoc.createNestedObject ("x");
-        // JsonObject JsonData = jsonDoc.as<JsonObject> ();
-
-        JsonData[CN_time] = SyncControl.TimeCorrectionFactor;
-        SyncControl.SavedTimeCorrectionFactor = SyncControl.TimeCorrectionFactor;
-
-        // extern void PrettyPrint (JsonObject & jsonStuff, String Name);
-        // PrettyPrint (JsonData, String ("SaveTimeCorrectionFactor"));
-
-        String JsonFileData;
-        serializeJson (JsonData, JsonFileData);
-        // DEBUG_V (String ("JsonFileData: ") + JsonFileData);
-        FileMgr.SaveSdFile (String(CN_time), JsonFileData);
-
-    } while (false);
-    
-    // DEBUG_END;
-
-} // SaveTimeCorrectionFactor
-
 //-----------------------------------------------------------------------------
 void c_InputFPPRemotePlayFile::ClearFileInfo()
 {
diff --git a/ESPixelStick/src/input/InputFPPRemotePlayFile.hpp b/ESPixelStick/src/input/InputFPPRemotePlayFile.hpp
index d519f62b7..95e4021ff 100644
--- a/ESPixelStick/src/input/InputFPPRemotePlayFile.hpp
+++ b/ESPixelStick/src/input/InputFPPRemotePlayFile.hpp
@@ -41,15 +41,10 @@ class c_InputFPPRemotePlayFile : public c_InputFPPRemotePlayItem
     void TimerPoll ();
 
     uint32_t GetLastFrameId ()  { return FrameControl.LastPlayedFrameId; }
-    float    GetTimeCorrectionFactor () { return SyncControl.TimeCorrectionFactor; }
 
 private:
-#define INVALID_TIME_CORRECTION_FACTOR -1.0
-#define INITIAL_TIME_CORRECTION_FACTOR  1.0
 #define ELAPSED_PLAY_TIMER_INTERVAL_MS  10
 
-    void InitTimeCorrectionFactor ();
-    void SaveTimeCorrectionFactor ();
     void ClearFileInfo            ();
 
     friend class fsm_PlayFile_state_Idle;
@@ -71,7 +66,7 @@ class c_InputFPPRemotePlayFile : public c_InputFPPRemotePlayItem
     {
         size_t            DataOffset = 0;
         uint32_t          ChannelsPerFrame = 0;
-        time_t            FrameStepTimeMS = 1;
+        uint32_t          FrameStepTimeMS = 1;
         uint32_t          TotalNumberOfFramesInSequence = 0;
         uint32_t          ElapsedPlayTimeMS = 0;
 
@@ -84,10 +79,6 @@ class c_InputFPPRemotePlayFile : public c_InputFPPRemotePlayItem
         uint32_t          SyncCount = 0;
         uint32_t          SyncAdjustmentCount = 0;
         uint32_t          LastRcvdSyncFrameId = 0;
-
-        double            TimeCorrectionFactor = INITIAL_TIME_CORRECTION_FACTOR;
-        double            SavedTimeCorrectionFactor = INVALID_TIME_CORRECTION_FACTOR;
-        uint32_t          AdjustedFrameStepTimeMS = 0;
     } SyncControl;
 
     uint8_t * Buffer = nullptr;
diff --git a/ESPixelStick/src/input/InputFPPRemotePlayFileFsm.cpp b/ESPixelStick/src/input/InputFPPRemotePlayFileFsm.cpp
index 368f03f3a..b808fab03 100644
--- a/ESPixelStick/src/input/InputFPPRemotePlayFileFsm.cpp
+++ b/ESPixelStick/src/input/InputFPPRemotePlayFileFsm.cpp
@@ -447,7 +447,6 @@ void fsm_PlayFile_state_Stopping::Poll ()
 
     FileMgr.CloseSdFile (p_Parent->FileHandleForFileBeingPlayed);
     p_Parent->FileHandleForFileBeingPlayed = 0;
-    p_Parent->SaveTimeCorrectionFactor ();
     p_Parent->fsm_PlayFile_state_Idle_imp.Init (p_Parent);
 
     if (FileName != "")
diff --git a/html/index.html b/html/index.html
index 96f516834..d9fc19a3c 100644
--- a/html/index.html
+++ b/html/index.html
@@ -108,7 +108,6 @@
                                 <tr><td width="50%">Filename: </td><td><span id="fppremoteFilePlayerFilename"></span></td></tr>
                                 <tr><td width="50%">Time Elapsed: </td><td><span id="fppremoteFilePlayerTimeElapsed"></span></td></tr>
                                 <tr><td width="50%">Time Remaining: </td><td><span id="fppremoteFilePlayerTimeRemaining"></span></td></tr>
-                                <tr><td width="50%">Frame Time Adjustment: </td><td><span id="fppremoteFilePlayerTimeOffset"></span></td></tr>
                             </table>
                         </fieldset>
                     </div>
diff --git a/html/script.js b/html/script.js
index a2cea61d6..96a82ec20 100644
--- a/html/script.js
+++ b/html/script.js
@@ -1604,7 +1604,6 @@ function ProcessReceivedJsonStatusMessage(data)
         $('#fppremoteFilePlayerFilename').text(FPPDstatus.current_sequence);
         $('#fppremoteFilePlayerTimeElapsed').text(FPPDstatus.time_elapsed);
         $('#fppremoteFilePlayerTimeRemaining').text(FPPDstatus.time_remaining);
-        $('#fppremoteFilePlayerTimeOffset').text(FPPDstatus.TimeOffset);
     }
     else
     {