diff --git a/doxy/_e_s_pixel_stick_8h_a067b67c856af5452506085e83cdb2b01_cgraph.map b/doxy/_e_s_pixel_stick_8h_a067b67c856af5452506085e83cdb2b01_cgraph.map
index a46ec7075..4a7e0b4dd 100644
--- a/doxy/_e_s_pixel_stick_8h_a067b67c856af5452506085e83cdb2b01_cgraph.map
+++ b/doxy/_e_s_pixel_stick_8h_a067b67c856af5452506085e83cdb2b01_cgraph.map
@@ -1,121 +1,122 @@
diff --git a/doxy/_e_s_pixel_stick_8h_a067b67c856af5452506085e83cdb2b01_cgraph.md5 b/doxy/_e_s_pixel_stick_8h_a067b67c856af5452506085e83cdb2b01_cgraph.md5
index eaf1ba332..558e792de 100644
--- a/doxy/_e_s_pixel_stick_8h_a067b67c856af5452506085e83cdb2b01_cgraph.md5
+++ b/doxy/_e_s_pixel_stick_8h_a067b67c856af5452506085e83cdb2b01_cgraph.md5
@@ -1 +1 @@
-4bcd46ce089ddb3d312aed998a5fef45
\ No newline at end of file
+83ab1128796f2b1a8eac1f3c708e9e64
\ No newline at end of file
diff --git a/doxy/_e_s_pixel_stick_8h_a067b67c856af5452506085e83cdb2b01_cgraph.png b/doxy/_e_s_pixel_stick_8h_a067b67c856af5452506085e83cdb2b01_cgraph.png
index f1ba1437d..533ffcd15 100644
Binary files a/doxy/_e_s_pixel_stick_8h_a067b67c856af5452506085e83cdb2b01_cgraph.png and b/doxy/_e_s_pixel_stick_8h_a067b67c856af5452506085e83cdb2b01_cgraph.png differ
diff --git a/doxy/_e_s_pixel_stick_8h_a23e7afe154bda4f1d2e44818ed09843e_cgraph.map b/doxy/_e_s_pixel_stick_8h_a23e7afe154bda4f1d2e44818ed09843e_cgraph.map
index af0601b60..b82524223 100644
--- a/doxy/_e_s_pixel_stick_8h_a23e7afe154bda4f1d2e44818ed09843e_cgraph.map
+++ b/doxy/_e_s_pixel_stick_8h_a23e7afe154bda4f1d2e44818ed09843e_cgraph.map
@@ -1,120 +1,122 @@
diff --git a/doxy/_e_s_pixel_stick_8h_a23e7afe154bda4f1d2e44818ed09843e_cgraph.md5 b/doxy/_e_s_pixel_stick_8h_a23e7afe154bda4f1d2e44818ed09843e_cgraph.md5
index 70493bf38..f229b8c90 100644
--- a/doxy/_e_s_pixel_stick_8h_a23e7afe154bda4f1d2e44818ed09843e_cgraph.md5
+++ b/doxy/_e_s_pixel_stick_8h_a23e7afe154bda4f1d2e44818ed09843e_cgraph.md5
@@ -1 +1 @@
-7c7a00c7e68f81bdf48faf6769620b7c
\ No newline at end of file
+615073a29df804ad2607db824df36ffa
\ No newline at end of file
diff --git a/doxy/_e_s_pixel_stick_8h_a23e7afe154bda4f1d2e44818ed09843e_cgraph.png b/doxy/_e_s_pixel_stick_8h_a23e7afe154bda4f1d2e44818ed09843e_cgraph.png
index 8e5e74f0b..73ee2c9c9 100644
Binary files a/doxy/_e_s_pixel_stick_8h_a23e7afe154bda4f1d2e44818ed09843e_cgraph.png and b/doxy/_e_s_pixel_stick_8h_a23e7afe154bda4f1d2e44818ed09843e_cgraph.png differ
diff --git a/doxy/_e_s_pixel_stick_8h_ace03924f16faf7e0c24590ede39ae2f2_icgraph.map b/doxy/_e_s_pixel_stick_8h_ace03924f16faf7e0c24590ede39ae2f2_icgraph.map
index febe6becc..029e326b6 100644
--- a/doxy/_e_s_pixel_stick_8h_ace03924f16faf7e0c24590ede39ae2f2_icgraph.map
+++ b/doxy/_e_s_pixel_stick_8h_ace03924f16faf7e0c24590ede39ae2f2_icgraph.map
@@ -1,120 +1,125 @@
diff --git a/doxy/_e_s_pixel_stick_8h_ace03924f16faf7e0c24590ede39ae2f2_icgraph.md5 b/doxy/_e_s_pixel_stick_8h_ace03924f16faf7e0c24590ede39ae2f2_icgraph.md5
index 98da2d822..369d5d7b3 100644
--- a/doxy/_e_s_pixel_stick_8h_ace03924f16faf7e0c24590ede39ae2f2_icgraph.md5
+++ b/doxy/_e_s_pixel_stick_8h_ace03924f16faf7e0c24590ede39ae2f2_icgraph.md5
@@ -1 +1 @@
-5287ac38e02d16df211fc53a4aff4edb
\ No newline at end of file
+82296c68e5c7fff7d2554e1762fb6c50
\ No newline at end of file
diff --git a/doxy/_e_s_pixel_stick_8h_ace03924f16faf7e0c24590ede39ae2f2_icgraph.png b/doxy/_e_s_pixel_stick_8h_ace03924f16faf7e0c24590ede39ae2f2_icgraph.png
index 05595fd0e..d5ca80de4 100644
Binary files a/doxy/_e_s_pixel_stick_8h_ace03924f16faf7e0c24590ede39ae2f2_icgraph.png and b/doxy/_e_s_pixel_stick_8h_ace03924f16faf7e0c24590ede39ae2f2_icgraph.png differ
diff --git a/doxy/_f_p_p_discovery_8h_source.html b/doxy/_f_p_p_discovery_8h_source.html
index c6699f821..7d0a2f8d3 100644
--- a/doxy/_f_p_p_discovery_8h_source.html
+++ b/doxy/_f_p_p_discovery_8h_source.html
@@ -203,92 +203,95 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 117 void ProcessGET (AsyncWebServerRequest* request);
-
- 119 void ProcessFile (AsyncWebServerRequest* request, String
filename, uint32_t index, uint8_t* data, uint32_t len,
bool final, uint32_t contentLength = 0);
- 120 void ProcessBody (AsyncWebServerRequest* request, uint8_t* data, uint32_t len, uint32_t index, uint32_t total);
- 121 void sendPingPacket (IPAddress destination = IPAddress(255, 255, 255, 255));
-
-
-
-
-
-
-
-
-
-
- 132 void GenerateFppSyncMsg (uint8_t Action,
const String & FileName, uint32_t CurrentFrame,
const float & ElpsedTime);
-
- 134# define SYNC_PKT_START 0
- 135# define SYNC_PKT_STOP 1
- 136# define SYNC_PKT_SYNC 2
- 137# define SYNC_PKT_OPEN 3
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 119 void ProcessGET (AsyncWebServerRequest* request);
+
+ 121 void ProcessFile (AsyncWebServerRequest* request, String
filename, uint32_t index, uint8_t* data, uint32_t len,
bool final, uint32_t contentLength = 0);
+ 122 void ProcessBody (AsyncWebServerRequest* request, uint8_t* data, uint32_t len, uint32_t index, uint32_t total);
+ 123 void sendPingPacket (IPAddress destination = IPAddress(255, 255, 255, 255));
+
+
+
+
+
+
+
+
+
+
+ 134 void GenerateFppSyncMsg (uint8_t Action,
const String & FileName, uint32_t CurrentFrame,
const float & ElpsedTime);
+
+ 136# define SYNC_PKT_START 0
+ 137# define SYNC_PKT_STOP 1
+ 138# define SYNC_PKT_SYNC 2
+ 139# define SYNC_PKT_OPEN 3
-
+
+
+
+
-c_FPPDiscovery FPPDiscovery
Definition FPPDiscovery.cpp:1261
+c_FPPDiscovery FPPDiscovery
Definition FPPDiscovery.cpp:1294
Definition FPPDiscovery.h:39
-void ProcessReceivedUdpPacket(AsyncUDPPacket _packet)
Definition FPPDiscovery.cpp:192
+void ProcessReceivedUdpPacket(AsyncUDPPacket _packet)
Definition FPPDiscovery.cpp:193
bool inFileUpload
Definition FPPDiscovery.h:48
void begin()
Definition FPPDiscovery.cpp:50
IPAddress FppRemoteIp
Definition FPPDiscovery.h:53
-void ProcessBody(AsyncWebServerRequest *request, uint8_t *data, uint32_t len, uint32_t index, uint32_t total)
Definition FPPDiscovery.cpp:842
-void ProcessPOST(AsyncWebServerRequest *request)
Definition FPPDiscovery.cpp:738
-void ProcessFile(AsyncWebServerRequest *request, String filename, uint32_t index, uint8_t *data, uint32_t len, bool final, uint32_t contentLength=0)
Definition FPPDiscovery.cpp:778
-virtual ~c_FPPDiscovery()
Definition FPPDiscovery.h:112
-void ProcessGET(AsyncWebServerRequest *request)
Definition FPPDiscovery.cpp:656
-void StopPlaying(bool wait=true)
Definition FPPDiscovery.cpp:1147
-void ProcessSyncPacket(uint8_t action, String filename, float seconds_elapsed)
Definition FPPDiscovery.cpp:335
-SystemDebugStats_t SystemDebugStats
Definition FPPDiscovery.h:108
+void ProcessBody(AsyncWebServerRequest *request, uint8_t *data, uint32_t len, uint32_t index, uint32_t total)
Definition FPPDiscovery.cpp:845
+void ProcessPOST(AsyncWebServerRequest *request)
Definition FPPDiscovery.cpp:739
+void ProcessFile(AsyncWebServerRequest *request, String filename, uint32_t index, uint8_t *data, uint32_t len, bool final, uint32_t contentLength=0)
Definition FPPDiscovery.cpp:779
+virtual ~c_FPPDiscovery()
Definition FPPDiscovery.h:113
+void ProcessGET(AsyncWebServerRequest *request)
Definition FPPDiscovery.cpp:657
+void StopPlaying(bool wait=true)
Definition FPPDiscovery.cpp:1178
+void ProcessSyncPacket(uint8_t action, String filename, float seconds_elapsed)
Definition FPPDiscovery.cpp:336
+SystemDebugStats_t SystemDebugStats
Definition FPPDiscovery.h:109
AsyncUDP udp
Definition FPPDiscovery.h:42
-void ProcessBlankPacket()
Definition FPPDiscovery.cpp:427
-void StartPlaying(String &FileName, float SecondsElapsed)
Definition FPPDiscovery.cpp:1106
-bool GetBlankOnStop(void)
Definition FPPDiscovery.h:129
-bool AllowedToRemotePlayFiles()
Definition FPPDiscovery.cpp:1180
-void GetSysInfoJSON(JsonObject &jsonResponse)
Definition FPPDiscovery.cpp:898
-void SetInputFPPRemotePlayFile(c_InputFPPRemotePlayFile *value)
Definition FPPDiscovery.cpp:1235
+void ProcessBlankPacket()
Definition FPPDiscovery.cpp:428
+void StartPlaying(String &FileName, float SecondsElapsed)
Definition FPPDiscovery.cpp:1137
+bool GetBlankOnStop(void)
Definition FPPDiscovery.h:131
+bool AllowedToRemotePlayFiles()
Definition FPPDiscovery.cpp:1213
+void ProcessFPPDJson(AsyncWebServerRequest *request)
Definition FPPDiscovery.cpp:1109
+void GetSysInfoJSON(JsonObject &jsonResponse)
Definition FPPDiscovery.cpp:901
+void SetInputFPPRemotePlayFile(c_InputFPPRemotePlayFile *value)
Definition FPPDiscovery.cpp:1268
const IPAddress MulticastAddress
Definition FPPDiscovery.h:55
void GetStatus(JsonObject &jsonStatus)
Definition FPPDiscovery.cpp:143
-void GenerateFppSyncMsg(uint8_t Action, const String &FileName, uint32_t CurrentFrame, const float &ElpsedTime)
Definition FPPDiscovery.cpp:1193
+void GenerateFppSyncMsg(uint8_t Action, const String &FileName, uint32_t CurrentFrame, const float &ElpsedTime)
Definition FPPDiscovery.cpp:1226
void GetDriverName(String &Name)
Definition FPPDiscovery.h:63
MultiSyncStats_t MultiSyncStats
Definition FPPDiscovery.h:85
bool IsEnabled
Definition FPPDiscovery.h:50
-void ProcessFPPJson(AsyncWebServerRequest *request)
Definition FPPDiscovery.cpp:1004
+void ProcessFPPJson(AsyncWebServerRequest *request)
Definition FPPDiscovery.cpp:1007
void NetworkStateChanged(bool NewNetworkState)
Definition FPPDiscovery.cpp:67
-bool PlayingFile()
Definition FPPDiscovery.cpp:440
+bool PlayingFile()
Definition FPPDiscovery.cpp:441
bool hasBeenInitialized
Definition FPPDiscovery.h:49
void Disable(void)
Definition FPPDiscovery.cpp:120
String UploadFileName
Definition FPPDiscovery.h:52
-void ForgetInputFPPRemotePlayFile()
Definition FPPDiscovery.cpp:1246
-void GetStatusJSON(JsonObject &jsonResponse, bool advanced)
Definition FPPDiscovery.cpp:929
+void ForgetInputFPPRemotePlayFile()
Definition FPPDiscovery.cpp:1279
+void GetStatusJSON(JsonObject &jsonResponse, bool advanced)
Definition FPPDiscovery.cpp:932
c_InputFPPRemotePlayFile * InputFPPRemotePlayFile
Definition FPPDiscovery.h:54
-void SetBlankOnStop(bool value)
Definition FPPDiscovery.h:128
+void SetBlankOnStop(bool value)
Definition FPPDiscovery.h:130
void PlayFile(String &FileToPlay)
bool BlankOnStop
Definition FPPDiscovery.h:51
-void BuildFseqResponse(String fname, c_FileMgr::FileId fseq, String &resp)
Definition FPPDiscovery.cpp:526
-void sendPingPacket(IPAddress destination=IPAddress(255, 255, 255, 255))
Definition FPPDiscovery.cpp:450
+void BuildFseqResponse(String fname, c_FileMgr::FileId fseq, String &resp)
Definition FPPDiscovery.cpp:527
+void sendPingPacket(IPAddress destination=IPAddress(255, 255, 255, 255))
Definition FPPDiscovery.cpp:451
c_FPPDiscovery()
Definition FPPDiscovery.cpp:42
void Enable(void)
Definition FPPDiscovery.cpp:132
uint32_t FileId
Definition FileMgr.hpp:50
@@ -314,12 +317,13 @@
uint32_t pktBlank
Definition FPPDiscovery.h:78
uint32_t pktSyncMedSync
Definition FPPDiscovery.h:77
Definition FPPDiscovery.h:100
-uint32_t CmdGetHostname
Definition FPPDiscovery.h:104
-uint32_t CmdNotFound
Definition FPPDiscovery.h:106
-uint32_t CmdGetConfig
Definition FPPDiscovery.h:105
-uint32_t CmdGetSysInfoJSON
Definition FPPDiscovery.h:103
+uint32_t CmdGetHostname
Definition FPPDiscovery.h:105
+uint32_t ProcessFPPDJson
Definition FPPDiscovery.h:102
+uint32_t CmdNotFound
Definition FPPDiscovery.h:107
+uint32_t CmdGetConfig
Definition FPPDiscovery.h:106
+uint32_t CmdGetSysInfoJSON
Definition FPPDiscovery.h:104
uint32_t ProcessFPPJson
Definition FPPDiscovery.h:101
-uint32_t CmdGetFPPstatus
Definition FPPDiscovery.h:102
+uint32_t CmdGetFPPstatus
Definition FPPDiscovery.h:103
diff --git a/doxy/_file_mgr_8hpp_source.html b/doxy/_file_mgr_8hpp_source.html
index a11797eab..8eb1fb8b8 100644
--- a/doxy/_file_mgr_8hpp_source.html
+++ b/doxy/_file_mgr_8hpp_source.html
@@ -184,40 +184,40 @@
-
- 85 void SaveSdFile (
const String & FileName, String & FileData);
- 86 void SaveSdFile (
const String & FileName, JsonVariant & FileData);
-
- 88 size_t ReadSdFile (
const FileId & FileHandle,
byte * FileData,
size_t NumBytesToRead);
- 89 size_t ReadSdFile (
const FileId & FileHandle,
byte * FileData,
size_t NumBytesToRead,
size_t StartingPosition);
- 90 bool ReadSdFile (
const String & FileName, String & FileData);
- 91 bool ReadSdFile (
const String & FileName, JsonDocument & FileData);
-
- 93 size_t WriteSdFile (
const FileId & FileHandle,
byte * FileData,
size_t NumBytesToWrite);
- 94 size_t WriteSdFile (
const FileId & FileHandle,
byte * FileData,
size_t NumBytesToWrite,
size_t StartingPosition);
-
-
-
-
-
-
-
-
-
-
-
-
- 107#define FSEQFILELIST "fseqfilelist.json"
-
- 109#if defined ARDUINO_ARCH_ESP8266
-
-
-
-
-
-
-
-
+ 84 void DeleteSdFile (
const String & FileName,
bool LockStatus =
false);
+ 85 void SaveSdFile (
const String & FileName, String & FileData,
bool LockStatus =
false);
+ 86 void SaveSdFile (
const String & FileName, JsonVariant & FileData,
bool LockStatus =
false);
+ 87 bool OpenSdFile (
const String & FileName,
FileMode Mode,
FileId & FileHandle,
int FileListIndex,
bool LockStatus =
false);
+ 88 size_t ReadSdFile (
const FileId & FileHandle,
byte * FileData,
size_t NumBytesToRead,
bool LockStatus =
false);
+ 89 size_t ReadSdFile (
const FileId & FileHandle,
byte * FileData,
size_t NumBytesToRead,
size_t StartingPosition,
bool LockStatus =
false);
+ 90 bool ReadSdFile (
const String & FileName, String & FileData,
bool LockStatus =
false);
+ 91 bool ReadSdFile (
const String & FileName, JsonDocument & FileData,
bool LockStatus =
false);
+ 92 size_t WriteSdFileBuf (
const FileId & FileHandle,
byte * FileData,
size_t NumBytesToWrite,
bool LockStatus =
false);
+ 93 size_t WriteSdFile (
const FileId & FileHandle,
byte * FileData,
size_t NumBytesToWrite,
bool LockStatus =
false);
+ 94 size_t WriteSdFile (
const FileId & FileHandle,
byte * FileData,
size_t NumBytesToWrite,
size_t StartingPosition,
bool LockStatus =
false);
+
+ 96 void GetListOfSdFiles (std::vector<String> & Response,
bool LockStatus =
false);
+ 97 uint64_t
GetSdFileSize (
const String & FileName,
bool LockStatus =
false);
+
+
+
+
+
+
+
+ 105#define FSEQFILELIST "fseqfilelist.json"
+
+ 107#if defined ARDUINO_ARCH_ESP8266
+
+
+
+
+
+
+
+
+ 116 void LockSd(
bool ExistingLockStatus);
+ 117 void UnLockSd(
bool ExistingLockStatus);
119# define SD_CARD_CLK_MHZ SD_SCK_MHZ(37)
120#ifndef MaxSdTransSpeedMHz
@@ -347,15 +347,17 @@
-
+
-
-
+
-
+
+
+
+
SdFs sd
Definition FileMgr.cpp:27
-c_FileMgr FileMgr
Definition FileMgr.cpp:1989
+c_FileMgr FileMgr
Definition FileMgr.cpp:2017
#define MaxOpenFiles
Definition FileMgr.hpp:215
#define MaxSdTransSpeedMHz
Definition FileMgr.hpp:121
#define SD_CARD_MISO_PIN
Definition GPIO_Defs_ESP32_Bong69.hpp:42
@@ -363,71 +365,72 @@
#define SD_CARD_MOSI_PIN
Definition GPIO_Defs_ESP32_Bong69.hpp:43
#define SD_CARD_CLK_PIN
Definition GPIO_Defs_ESP32_Bong69.hpp:44
Definition FileMgr.hpp:45
-size_t GetDefaultFseqFileList(uint8_t *buffer, size_t maxlen)
Definition FileMgr.cpp:1975
-FileId CreateSdFileHandle()
Definition FileMgr.cpp:974
-void printDirectory(FsFile &dir, int numTabs)
Definition FileMgr.cpp:1104
-void GetListOfSdFiles(std::vector< String > &Response)
Definition FileMgr.cpp:1046
-void SetSdSpeed()
Definition FileMgr.cpp:451
-void SaveSdFile(const String &FileName, String &FileData)
Definition FileMgr.cpp:1145
-void DeleteFlashFile(const String &FileName)
Definition FileMgr.cpp:538
+size_t GetDefaultFseqFileList(uint8_t *buffer, size_t maxlen)
Definition FileMgr.cpp:1967
+FileId CreateSdFileHandle()
Definition FileMgr.cpp:975
+void printDirectory(FsFile &dir, int numTabs)
Definition FileMgr.cpp:1112
+size_t WriteSdFile(const FileId &FileHandle, byte *FileData, size_t NumBytesToWrite, bool LockStatus=false)
Definition FileMgr.cpp:1487
+void SetSdSpeed()
Definition FileMgr.cpp:452
+void DeleteFlashFile(const String &FileName)
Definition FileMgr.cpp:539
String fsUploadFileName
Definition FileMgr.hpp:135
-void GetConfig(JsonObject &json)
Definition FileMgr.cpp:277
+void GetConfig(JsonObject &json)
Definition FileMgr.cpp:278
static const FileId INVALID_FILE_HANDLE
Definition FileMgr.hpp:51
-void InitSdFileList()
Definition FileMgr.cpp:930
+void InitSdFileList()
Definition FileMgr.cpp:931
File FileSendDir
Definition FileMgr.hpp:239
c_FileMgr()
< Start up the driver and put it into a safe mode
Definition FileMgr.cpp:141
-void Begin()
< Start the module
Definition FileMgr.cpp:157
-void ResumeSdFile(const FileId &FileHandle)
Definition FileMgr.cpp:1630
-void DeleteSdFile(const String &FileName)
Definition FileMgr.cpp:1011
+void Begin()
< Start the module
Definition FileMgr.cpp:158
uint8_t clk_pin
Definition FileMgr.hpp:132
-void BuildFseqList()
Definition FileMgr.cpp:1696
+bool OpenSdFile(const String &FileName, FileMode Mode, FileId &FileHandle, int FileListIndex, bool LockStatus=false)
Definition FileMgr.cpp:1189
uint8_t cs_pin
Definition FileMgr.hpp:133
uint32_t LastFileSent
Definition FileMgr.hpp:240
-void listDir(fs::FS &fs, String dirname, uint8_t levels)
Definition FileMgr.cpp:549
+void listDir(fs::FS &fs, String dirname, uint8_t levels)
Definition FileMgr.cpp:550
uint64_t SdCardSizeMB
Definition FileMgr.hpp:142
-size_t WriteSdFileBuf(const FileId &FileHandle, byte *FileData, size_t NumBytesToWrite)
Definition FileMgr.cpp:1491
-void GetStatus(JsonObject &json)
Definition FileMgr.cpp:296
-size_t ReadSdFile(const FileId &FileHandle, byte *FileData, size_t NumBytesToRead)
Definition FileMgr.cpp:1392
-bool OpenSdFile(const String &FileName, FileMode Mode, FileId &FileHandle, int FileListIndex=-1)
Definition FileMgr.cpp:1179
-bool LoadFlashFile(const String &FileName, DeserializationHandler Handler)
Definition FileMgr.cpp:592
-int FileListFindSdFileHandle(FileId HandleToFind)
Definition FileMgr.cpp:946
+void GetStatus(JsonObject &json)
Definition FileMgr.cpp:297
+uint64_t GetSdFileSize(const String &FileName, bool LockStatus=false)
Definition FileMgr.cpp:1641
+bool LoadFlashFile(const String &FileName, DeserializationHandler Handler)
Definition FileMgr.cpp:593
+int FileListFindSdFileHandle(FileId HandleToFind)
Definition FileMgr.cpp:947
FileListEntry_t FileList[MaxOpenFiles]
Definition FileMgr.hpp:235
uint32_t MaxSdSpeed
Definition FileMgr.hpp:143
String FtpPassword
Definition FileMgr.hpp:139
-virtual ~c_FileMgr()
< deallocate any resources and put the output channels into a safe state
Definition FileMgr.cpp:147
+virtual ~c_FileMgr()
< deallocate any resources and put the output channels into a safe state
Definition FileMgr.cpp:148
String WelcomeString
Definition FileMgr.hpp:140
String FtpUserName
Definition FileMgr.hpp:138
uint32_t FileId
Definition FileMgr.hpp:50
uint8_t mosi_pin
Definition FileMgr.hpp:131
-bool handleFileUpload(const String &filename, size_t index, uint8_t *data, size_t len, bool final, uint32_t totalLen)
Definition FileMgr.cpp:1843
+bool handleFileUpload(const String &filename, size_t index, uint8_t *data, size_t len, bool final, uint32_t totalLen)
Definition FileMgr.cpp:1833
+bool SdAccessSemaphore
Definition FileMgr.hpp:243
bool FtpEnabled
Definition FileMgr.hpp:141
-void NetworkStateChanged(bool NewState)
Definition FileMgr.cpp:188
+void NetworkStateChanged(bool NewState)
Definition FileMgr.cpp:189
uint32_t expectedIndex
Definition FileMgr.hpp:241
+void SaveSdFile(const String &FileName, String &FileData, bool LockStatus=false)
Definition FileMgr.cpp:1153
FileMode
Definition FileMgr.hpp:64
@ FileWrite
Definition FileMgr.hpp:66
@ FileAppend
Definition FileMgr.hpp:67
@ FileRead
Definition FileMgr.hpp:65
-void SetSpiIoPins()
Definition FileMgr.cpp:338
-bool SaveFlashFile(const String &FileName, String &FileData)
Definition FileMgr.cpp:661
+void SetSpiIoPins()
Definition FileMgr.cpp:339
+bool SaveFlashFile(const String &FileName, String &FileData)
Definition FileMgr.cpp:662
FileId fsUploadFileHandle
Definition FileMgr.hpp:134
-void DescribeSdCardToUser()
Definition FileMgr.cpp:1027
-void CloseSdFile(FileId &FileHandle)
Definition FileMgr.cpp:1417
+void DescribeSdCardToUser()
Definition FileMgr.cpp:1033
std::function< void(JsonDocument &json)> DeserializationHandler
Definition FileMgr.hpp:61
+size_t WriteSdFileBuf(const FileId &FileHandle, byte *FileData, size_t NumBytesToWrite, bool LockStatus=false)
Definition FileMgr.cpp:1532
bool SdCardIsInstalled()
Definition FileMgr.hpp:82
-bool ReadFlashFile(const String &FileName, String &FileData)
Definition FileMgr.cpp:796
+void DeleteSdFile(const String &FileName, bool LockStatus=false)
Definition FileMgr.cpp:1012
+void UnLockSd(bool ExistingLockStatus)
Definition FileMgr.cpp:2002
+size_t ReadSdFile(const FileId &FileHandle, byte *FileData, size_t NumBytesToRead, bool LockStatus=false)
Definition FileMgr.cpp:1421
+bool ReadFlashFile(const String &FileName, String &FileData)
Definition FileMgr.cpp:797
uint32_t fsUploadStartTime
Definition FileMgr.hpp:137
-uint64_t GetSdFileSize(const String &FileName)
Definition FileMgr.cpp:1593
-void handleFileUploadNewFile(const String &filename)
Definition FileMgr.cpp:1943
+void handleFileUploadNewFile(const String &filename)
Definition FileMgr.cpp:1935
bool SdCardInstalled
Definition FileMgr.hpp:129
-void ResetSdCard()
Definition FileMgr.cpp:516
-bool SetConfig(JsonObject &json)
Definition FileMgr.cpp:224
-void PauseSdFile(const FileId &FileHandle)
Definition FileMgr.cpp:1665
+void GetListOfSdFiles(std::vector< String > &Response, bool LockStatus=false)
Definition FileMgr.cpp:1052
+void ResetSdCard()
Definition FileMgr.cpp:517
+bool SetConfig(JsonObject &json)
Definition FileMgr.cpp:225
bool fsUploadFileSavedIsEnabled
Definition FileMgr.hpp:136
uint8_t miso_pin
Definition FileMgr.hpp:130
-void Poll()
Definition FileMgr.cpp:211
-bool FlashFileExists(const String &FileName)
Definition FileMgr.cpp:921
-void GetDriverName(String &Name)
Definition FileMgr.hpp:103
-size_t WriteSdFile(const FileId &FileHandle, byte *FileData, size_t NumBytesToWrite)
Definition FileMgr.cpp:1453
+void CloseSdFile(FileId &FileHandle, bool LockStatus=false)
Definition FileMgr.cpp:1448
+void Poll()
Definition FileMgr.cpp:212
+bool FlashFileExists(const String &FileName)
Definition FileMgr.cpp:922
+void LockSd(bool ExistingLockStatus)
Definition FileMgr.cpp:1981
+void BuildFseqList(bool LockStatus=false)
Definition FileMgr.cpp:1682
+void GetDriverName(String &Name)
Definition FileMgr.hpp:101
char filename[250]
Definition fseq.h:7
struct FSEQParsedRangeEntry __attribute__
Definition FileMgr.hpp:217
diff --git a/doxy/_input_e131_8hpp_source.html b/doxy/_input_e131_8hpp_source.html
index 89d6774f0..ea5bed1a7 100644
--- a/doxy/_input_e131_8hpp_source.html
+++ b/doxy/_input_e131_8hpp_source.html
@@ -185,28 +185,28 @@
-
+
-
+
-
+
-
+
-
+
diff --git a/doxy/_input_f_p_p_remote_8h_source.html b/doxy/_input_f_p_p_remote_8h_source.html
index cdb8ed315..80b9c830d 100644
--- a/doxy/_input_f_p_p_remote_8h_source.html
+++ b/doxy/_input_f_p_p_remote_8h_source.html
@@ -188,34 +188,34 @@
-
+
-
-
-
+
+
+
-
+
-
-
-
+
+
+
-
-
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
+
+
diff --git a/doxy/_input_f_p_p_remote_play_file_fsm_8hpp_source.html b/doxy/_input_f_p_p_remote_play_file_fsm_8hpp_source.html
index 757c6277d..4ebd745a6 100644
--- a/doxy/_input_f_p_p_remote_play_file_fsm_8hpp_source.html
+++ b/doxy/_input_f_p_p_remote_play_file_fsm_8hpp_source.html
@@ -269,14 +269,14 @@
Definition InputFPPRemotePlayFileFsm.hpp:136
-virtual void Stop(void)
Definition InputFPPRemotePlayFileFsm.cpp:641
+virtual void Stop(void)
Definition InputFPPRemotePlayFileFsm.cpp:655
fsm_PlayFile_state_Error()
Definition InputFPPRemotePlayFileFsm.hpp:138
virtual ~fsm_PlayFile_state_Error()
Definition InputFPPRemotePlayFileFsm.hpp:139
-virtual void Init(c_InputFPPRemotePlayFile *Parent)
Definition InputFPPRemotePlayFileFsm.cpp:603
+virtual void Init(c_InputFPPRemotePlayFile *Parent)
Definition InputFPPRemotePlayFileFsm.cpp:617
virtual void GetStateName(String &sName)
Definition InputFPPRemotePlayFileFsm.hpp:143
-virtual bool Poll()
Definition InputFPPRemotePlayFileFsm.cpp:576
-virtual IRAM_ATTR void TimerPoll()
Definition InputFPPRemotePlayFileFsm.cpp:590
-virtual bool Sync(String &FileName, float SecondsElapsed)
Definition InputFPPRemotePlayFileFsm.cpp:653
+virtual bool Poll()
Definition InputFPPRemotePlayFileFsm.cpp:590
+virtual IRAM_ATTR void TimerPoll()
Definition InputFPPRemotePlayFileFsm.cpp:604
+virtual bool Sync(String &FileName, float SecondsElapsed)
Definition InputFPPRemotePlayFileFsm.cpp:667
Definition InputFPPRemotePlayFileFsm.hpp:55
virtual bool Sync(String &FileName, float SecondsElapsed)
Definition InputFPPRemotePlayFileFsm.cpp:97
virtual IRAM_ATTR void TimerPoll()
Definition InputFPPRemotePlayFileFsm.cpp:40
@@ -306,15 +306,15 @@
virtual void Init(c_InputFPPRemotePlayFile *Parent)
Definition InputFPPRemotePlayFileFsm.cpp:134
virtual void Stop(void)
Definition InputFPPRemotePlayFileFsm.cpp:168
Definition InputFPPRemotePlayFileFsm.hpp:114
-virtual bool Sync(String &FileName, float SecondsElapsed)
Definition InputFPPRemotePlayFileFsm.cpp:563
-virtual void Stop(void)
Definition InputFPPRemotePlayFileFsm.cpp:553
-virtual IRAM_ATTR void TimerPoll()
Definition InputFPPRemotePlayFileFsm.cpp:519
+virtual bool Sync(String &FileName, float SecondsElapsed)
Definition InputFPPRemotePlayFileFsm.cpp:577
+virtual void Stop(void)
Definition InputFPPRemotePlayFileFsm.cpp:567
+virtual IRAM_ATTR void TimerPoll()
Definition InputFPPRemotePlayFileFsm.cpp:533
String FileName
Definition InputFPPRemotePlayFileFsm.hpp:128
fsm_PlayFile_state_Stopping()
Definition InputFPPRemotePlayFileFsm.hpp:116
-virtual bool Poll()
Definition InputFPPRemotePlayFileFsm.cpp:486
+virtual bool Poll()
Definition InputFPPRemotePlayFileFsm.cpp:500
virtual void GetStateName(String &sName)
Definition InputFPPRemotePlayFileFsm.hpp:121
uint32_t StartingElapsedTime
Definition InputFPPRemotePlayFileFsm.hpp:129
-virtual void Init(c_InputFPPRemotePlayFile *Parent)
Definition InputFPPRemotePlayFileFsm.cpp:526
+virtual void Init(c_InputFPPRemotePlayFile *Parent)
Definition InputFPPRemotePlayFileFsm.cpp:540
uint32_t PlayCount
Definition InputFPPRemotePlayFileFsm.hpp:130
virtual ~fsm_PlayFile_state_Stopping()
Definition InputFPPRemotePlayFileFsm.hpp:117
Definition InputFPPRemotePlayFileFsm.hpp:34
diff --git a/doxy/_input_mgr_8hpp_source.html b/doxy/_input_mgr_8hpp_source.html
index 2948ae1d3..353cba32b 100644
--- a/doxy/_input_mgr_8hpp_source.html
+++ b/doxy/_input_mgr_8hpp_source.html
@@ -231,7 +231,7 @@
RecordType type
Definition EFUpdate.h:0
-c_FileMgr FileMgr
Definition FileMgr.cpp:1989
+c_FileMgr FileMgr
Definition FileMgr.cpp:2017
@@ -240,7 +240,7 @@
void StartTimer(uint32_t DurationMS, bool continuous)
< Start the module
Definition FastTimer.cpp:41
-void DeleteFlashFile(const String &FileName)
Definition FileMgr.cpp:538
+void DeleteFlashFile(const String &FileName)
Definition FileMgr.cpp:539
diff --git a/doxy/_output_mgr_8hpp_source.html b/doxy/_output_mgr_8hpp_source.html
index 28793b8e2..6d085c990 100644
--- a/doxy/_output_mgr_8hpp_source.html
+++ b/doxy/_output_mgr_8hpp_source.html
@@ -382,13 +382,13 @@
-c_FileMgr FileMgr
Definition FileMgr.cpp:1989
+c_FileMgr FileMgr
Definition FileMgr.cpp:2017
#define OM_MAX_NUM_CHANNELS
Definition OutputMgr.hpp:202
#define NO_CONFIG_NEEDED
Definition OutputMgr.hpp:237
#define NUM_UARTS
forward declaration to the pure virtual output class that will be defined later.
Definition OutputMgr.hpp:35
c_OutputMgr OutputMgr
Definition OutputMgr.cpp:1563
-void DeleteFlashFile(const String &FileName)
Definition FileMgr.cpp:538
+void DeleteFlashFile(const String &FileName)
Definition FileMgr.cpp:539
Definition OutputCommon.hpp:31
Definition OutputMgr.hpp:39
bool ConsoleUartIsActive
Definition OutputMgr.hpp:258
diff --git a/doxy/_output_w_s2811_8hpp_source.html b/doxy/_output_w_s2811_8hpp_source.html
index cfd1e02b9..86b0ea81b 100644
--- a/doxy/_output_w_s2811_8hpp_source.html
+++ b/doxy/_output_w_s2811_8hpp_source.html
@@ -103,7 +103,7 @@
-
+
@@ -152,25 +152,29 @@
52#define WS2811_PIXEL_NS_BIT_TOTAL ( (1.0 / WS2811_PIXEL_DATA_RATE) * NanoSecondsInASecond)
53#ifdef ARDUINO_ARCH_ESP32
- 55 #define WS2811_PIXEL_NS_BIT_0_HIGH 312.0
- 56 #define WS2811_PIXEL_NS_BIT_0_LOW 945.0
- 57 #define WS2811_PIXEL_NS_BIT_1_HIGH 975.0
- 58 #define WS2811_PIXEL_NS_BIT_1_LOW 300.0
-
- 60 #define WS2811_PIXEL_NS_BIT_0_HIGH 312.0
- 61 #define WS2811_PIXEL_NS_BIT_0_LOW (WS2811_PIXEL_NS_BIT_TOTAL - WS2811_PIXEL_NS_BIT_0_HIGH)
- 62 #define WS2811_PIXEL_NS_BIT_1_HIGH 975.0
- 63 #define WS2811_PIXEL_NS_BIT_1_LOW (WS2811_PIXEL_NS_BIT_TOTAL - WS2811_PIXEL_NS_BIT_1_HIGH)
-
-
- 66#define WS2811_PIXEL_IDLE_TIME_US 350.0
- 67#define WS2811_PIXEL_IDLE_TIME_NS WS2811_PIXEL_IDLE_TIME_US * NanoSecondsInAMicroSecond
-
- 69#define WS2811_PIXEL_BITS_PER_INTENSITY 8
-
-
+
+
+
+
+ 59 #define WS2811_PIXEL_NS_BIT_0_HIGH 300.0
+ 60 #define WS2811_PIXEL_NS_BIT_0_LOW (WS2811_PIXEL_NS_BIT_TOTAL - WS2811_PIXEL_NS_BIT_0_HIGH)
+ 61 #define WS2811_PIXEL_NS_BIT_1_HIGH WS2811_PIXEL_NS_BIT_0_LOW
+ 62 #define WS2811_PIXEL_NS_BIT_1_LOW WS2811_PIXEL_NS_BIT_0_HIGH
+
+ 64 #define WS2811_PIXEL_NS_BIT_0_HIGH 312.0
+ 65 #define WS2811_PIXEL_NS_BIT_0_LOW (WS2811_PIXEL_NS_BIT_TOTAL - WS2811_PIXEL_NS_BIT_0_HIGH)
+ 66 #define WS2811_PIXEL_NS_BIT_1_HIGH 975.0
+ 67 #define WS2811_PIXEL_NS_BIT_1_LOW (WS2811_PIXEL_NS_BIT_TOTAL - WS2811_PIXEL_NS_BIT_1_HIGH)
+
+
+ 70#define WS2811_PIXEL_IDLE_TIME_US 350.0
+ 71#define WS2811_PIXEL_IDLE_TIME_NS WS2811_PIXEL_IDLE_TIME_US * NanoSecondsInAMicroSecond
-
+ 73#define WS2811_PIXEL_BITS_PER_INTENSITY 8
+
+
+
+
const CN_PROGMEM char CN_WS2811[]
Definition ConstNames.cpp:233
virtual void GetDriverName(String &sDriverName)=0
get the name for the instantiated driver
diff --git a/doxy/_web_mgr_8hpp_source.html b/doxy/_web_mgr_8hpp_source.html
index 71aca2ebc..ac71722d8 100644
--- a/doxy/_web_mgr_8hpp_source.html
+++ b/doxy/_web_mgr_8hpp_source.html
@@ -213,7 +213,7 @@
uint32_t size
Definition EFUpdate.h:1
-c_WebMgr WebMgr
Definition WebMgr.cpp:861
+c_WebMgr WebMgr
Definition WebMgr.cpp:893
static const FileId INVALID_FILE_HANDLE
Definition FileMgr.hpp:51
uint32_t FileId
Definition FileMgr.hpp:50
@@ -221,34 +221,34 @@
void ValidateConfig(config_t *NewConfig)
void Begin(config_t *NewConfig)
set up the operating environment based on the current config (or defaults)
Definition WebMgr.cpp:100
-void ProcessSetTimeRequest(time_t DateTime)
Definition WebMgr.cpp:772
+void ProcessSetTimeRequest(time_t DateTime)
Definition WebMgr.cpp:804
void processCmdGet(JsonObject &jsonCmd)
-void GetFseqFileListHandler(AsyncWebServerRequest *request)
Definition WebMgr.cpp:611
+void GetFseqFileListHandler(AsyncWebServerRequest *request)
Definition WebMgr.cpp:643
size_t NumberOfBytesTransfered
Definition WebMgr.hpp:106
EspalexaDevice * pAlexaDevice
Definition WebMgr.hpp:51
void init()
Definition WebMgr.cpp:132
-void Process()
Definition WebMgr.cpp:848
+void Process()
Definition WebMgr.cpp:880
DeviceCallbackFunction pAlexaCallback
Definition WebMgr.hpp:50
-void FirmwareUpload(AsyncWebServerRequest *request, String filename, uint32_t index, uint8_t *data, uint32_t len, bool final)
Definition WebMgr.cpp:785
+void FirmwareUpload(AsyncWebServerRequest *request, String filename, uint32_t index, uint8_t *data, uint32_t len, bool final)
Definition WebMgr.cpp:817
c_WebMgr()
< Start up the driver and put it into a safe mode
Definition WebMgr.cpp:82
bool IsAlexaCallbackValid()
Definition WebMgr.hpp:40
WebJsonDocument * WebJsonDoc
Definition WebMgr.hpp:102
-void onAlexaMessage(EspalexaDevice *pDevice)
Definition WebMgr.cpp:539
+void onAlexaMessage(EspalexaDevice *pDevice)
Definition WebMgr.cpp:571
void GetDriverName(String &Name)
Definition WebMgr.hpp:43
size_t TotalFileSizeToTransfer
Definition WebMgr.hpp:105
void processCmdDelete(JsonObject &jsonCmd)
-void CreateAdminInfoFile()
Definition WebMgr.cpp:579
+void CreateAdminInfoFile()
Definition WebMgr.cpp:611
-size_t GetFseqFileListChunk(uint8_t *buffer, size_t maxlen, size_t index)
Definition WebMgr.cpp:627
+size_t GetFseqFileListChunk(uint8_t *buffer, size_t maxlen, size_t index)
Definition WebMgr.cpp:659
bool processCmdSet(JsonObject &jsonCmd)
void NetworkStateChanged(bool NewNetworkState)
Definition WebMgr.cpp:118
c_FileMgr::FileId FileHandle
Definition WebMgr.hpp:104
-void RegisterAlexaCallback(DeviceCallbackFunction cb)
Definition WebMgr.cpp:528
+void RegisterAlexaCallback(DeviceCallbackFunction cb)
Definition WebMgr.cpp:560
JsonDocument WebJsonDocument
Definition WebMgr.hpp:99
void processCmdOpt(JsonObject &jsonCmd)
virtual ~c_WebMgr()
< deallocate any resources and put the output channels into a safe state
Definition WebMgr.cpp:90
-void ProcessXJRequest(AsyncWebServerRequest *client)
Definition WebMgr.cpp:716
+void ProcessXJRequest(AsyncWebServerRequest *client)
Definition WebMgr.cpp:748
EFUpdate efupdate
Definition WebMgr.hpp:49
diff --git a/doxy/classc___f_p_p_discovery-members.html b/doxy/classc___f_p_p_discovery-members.html
index da59f690f..fe5b5cec2 100644
--- a/doxy/classc___f_p_p_discovery-members.html
+++ b/doxy/classc___f_p_p_discovery-members.html
@@ -123,20 +123,21 @@
ProcessBlankPacket() | c_FPPDiscovery | private |
ProcessBody(AsyncWebServerRequest *request, uint8_t *data, uint32_t len, uint32_t index, uint32_t total) | c_FPPDiscovery | |
ProcessFile(AsyncWebServerRequest *request, String filename, uint32_t index, uint8_t *data, uint32_t len, bool final, uint32_t contentLength=0) | c_FPPDiscovery | |
- ProcessFPPJson(AsyncWebServerRequest *request) | c_FPPDiscovery | |
- ProcessGET(AsyncWebServerRequest *request) | c_FPPDiscovery | |
- ProcessPOST(AsyncWebServerRequest *request) | c_FPPDiscovery | |
- ProcessReceivedUdpPacket(AsyncUDPPacket _packet) | c_FPPDiscovery | private |
- ProcessSyncPacket(uint8_t action, String filename, float seconds_elapsed) | c_FPPDiscovery | private |
- sendPingPacket(IPAddress destination=IPAddress(255, 255, 255, 255)) | c_FPPDiscovery | |
- SetBlankOnStop(bool value) | c_FPPDiscovery | inline |
- SetInputFPPRemotePlayFile(c_InputFPPRemotePlayFile *value) | c_FPPDiscovery | |
- StartPlaying(String &FileName, float SecondsElapsed) | c_FPPDiscovery | private |
- StopPlaying(bool wait=true) | c_FPPDiscovery | private |
- SystemDebugStats | c_FPPDiscovery | private |
- udp | c_FPPDiscovery | private |
- UploadFileName | c_FPPDiscovery | private |
- ~c_FPPDiscovery() | c_FPPDiscovery | inlinevirtual |
+ ProcessFPPDJson(AsyncWebServerRequest *request) | c_FPPDiscovery | |
+ ProcessFPPJson(AsyncWebServerRequest *request) | c_FPPDiscovery | |
+ ProcessGET(AsyncWebServerRequest *request) | c_FPPDiscovery | |
+ ProcessPOST(AsyncWebServerRequest *request) | c_FPPDiscovery | |
+ ProcessReceivedUdpPacket(AsyncUDPPacket _packet) | c_FPPDiscovery | private |
+ ProcessSyncPacket(uint8_t action, String filename, float seconds_elapsed) | c_FPPDiscovery | private |
+ sendPingPacket(IPAddress destination=IPAddress(255, 255, 255, 255)) | c_FPPDiscovery | |
+ SetBlankOnStop(bool value) | c_FPPDiscovery | inline |
+ SetInputFPPRemotePlayFile(c_InputFPPRemotePlayFile *value) | c_FPPDiscovery | |
+ StartPlaying(String &FileName, float SecondsElapsed) | c_FPPDiscovery | private |
+ StopPlaying(bool wait=true) | c_FPPDiscovery | private |
+ SystemDebugStats | c_FPPDiscovery | private |
+ udp | c_FPPDiscovery | private |
+ UploadFileName | c_FPPDiscovery | private |
+ ~c_FPPDiscovery() | c_FPPDiscovery | inlinevirtual |
diff --git a/doxy/classc___f_p_p_discovery.html b/doxy/classc___f_p_p_discovery.html
index 545dd3196..10b37168a 100644
--- a/doxy/classc___f_p_p_discovery.html
+++ b/doxy/classc___f_p_p_discovery.html
@@ -159,6 +159,8 @@
|
void | ProcessFPPJson (AsyncWebServerRequest *request) |
|
+void | ProcessFPPDJson (AsyncWebServerRequest *request) |
+ |
void | ProcessGET (AsyncWebServerRequest *request) |
|
void | ProcessPOST (AsyncWebServerRequest *request) |
@@ -448,59 +450,61 @@