Jan/WLED_MM_Infinity
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/mdev_new-FrameWork-V4' into mdev

Browse Source
This commit is contained in:
Ewowi
2022-09-06 17:53:02 +02:00
parent ab65970a9d 7a5a460bdf
commit 0fad8ffd85
13 changed files with 945 additions and 760 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
usermods/audioreactive/audio_source.h
View File

@@ -17,8 +17,8 @@
// see https://docs.espressif.com/projects/esp-idf/en/latest/esp32s3/hw-reference/chip-series-comparison.html#related-documents
// and https://docs.espressif.com/projects/esp-idf/en/latest/esp32s3/api-reference/peripherals/i2s.html#overview-of-all-modes
#if defined(CONFIG_IDF_TARGET_ESP32C2) || defined(CONFIG_IDF_TARGET_ESP32S2) || defined(CONFIG_IDF_TARGET_ESP32H2)
#error This audio reactive usermod does not support ESP32-C2, ESP32-C3 or ESP32-S2.
#if defined(CONFIG_IDF_TARGET_ESP32C2) || defined(CONFIG_IDF_TARGET_ESP32S2)
#warning This audio reactive usermod does not support the ESP32-C2 or ESP32-S2, because the device has too limited I2S capabilities
#endif
/* ToDo: remove. ES7243 is controlled via compiler defines
@@ -233,6 +233,7 @@ class I2SSource : public AudioSource {
void _routeMclk(int8_t mclkPin) {
#if !defined(CONFIG_IDF_TARGET_ESP32S2) && !defined(CONFIG_IDF_TARGET_ESP32C3) && !defined(CONFIG_IDF_TARGET_ESP32S3)
// this way of MCLK routing only works on "classic" ESP32
/* Enable the mclk routing depending on the selected mclk pin
Only I2S_NUM_0 is supported
*/

10
usermods/customeffects/arti.h
View File

@@ -2450,7 +2450,7 @@ public:
strcat(logFileName, ".log");
#if ARTI_PLATFORM == ARTI_ARDUINO
logFile = LITTLEFS.open(logFileName,"w");
logFile = WLED_FS.open(logFileName,"w");
#else
logFile = fopen (logFileName,"w");
#endif
@@ -2463,7 +2463,7 @@ public:
#if ARTI_PLATFORM == ARTI_ARDUINO
File definitionFile;
definitionFile = LITTLEFS.open(definitionName, "r");
definitionFile = WLED_FS.open(definitionName, "r");
#else
std::fstream definitionFile;
definitionFile.open(definitionName, std::ios::in);
@@ -2517,7 +2517,7 @@ public:
#if ARTI_PLATFORM == ARTI_ARDUINO
File programFile;
programFile = LITTLEFS.open(programName, "r");
programFile = WLED_FS.open(programName, "r");
#else
std::fstream programFile;
programFile.open(programName, std::ios::in);
@@ -2564,7 +2564,7 @@ public:
#ifdef ARTI_DEBUG // only read write file if debug is on
#if ARTI_PLATFORM == ARTI_ARDUINO
File parseTreeFile;
parseTreeFile = LITTLEFS.open(parseTreeName, loadParseTreeFile?"r":"w");
parseTreeFile = WLED_FS.open(parseTreeName, loadParseTreeFile?"r":"w");
#else
std::fstream parseTreeFile;
parseTreeFile.open(parseTreeName, loadParseTreeFile?std::ios::in:std::ios::out);
@@ -2711,7 +2711,7 @@ public:
closeLog();
#if ARTI_PLATFORM == ARTI_ARDUINO
LITTLEFS.remove(logFileName); //cleanup the /edit folder a bit
WLED_FS.remove(logFileName); //cleanup the /edit folder a bit
#endif
}
}; //ARTI