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

Merge branch 'custom-effects' into mdev

Browse Source
This commit is contained in:
Ewowi
2022-09-20 11:21:32 +02:00
parent 96fc330b26 6e45515527
commit 7944a5696c
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
usermods/customeffects/arti.h
View File

@@ -1040,8 +1040,8 @@ class ARTI {
private: private:
Lexer *lexer = nullptr; Lexer *lexer = nullptr;
DynamicJsonDocument *definitionJsonDoc = nullptr; PSRAMDynamicJsonDocument *definitionJsonDoc = nullptr;
DynamicJsonDocument *parseTreeJsonDoc = nullptr; PSRAMDynamicJsonDocument *parseTreeJsonDoc = nullptr;
JsonObject definitionJson; JsonObject definitionJson;
JsonVariant parseTreeJson; JsonVariant parseTreeJson;
@@ -2479,9 +2479,9 @@ public:
//open definitionFile //open definitionFile
#if ARTI_PLATFORM == ARTI_ARDUINO #if ARTI_PLATFORM == ARTI_ARDUINO
definitionJsonDoc = new DynamicJsonDocument(8192); //currently 5335 definitionJsonDoc = new PSRAMDynamicJsonDocument(8192); //currently 5335
#else #else
definitionJsonDoc = new DynamicJsonDocument(16384); //currently 9521 definitionJsonDoc = new PSRAMDynamicJsonDocument(16384); //currently 9521
#endif #endif
// mandatory tokens: // mandatory tokens:
@@ -2552,9 +2552,9 @@ public:
// strcpy(parseTreeName, "Gen"); // strcpy(parseTreeName, "Gen");
strcat(parseTreeName, ".json"); strcat(parseTreeName, ".json");
#if ARTI_PLATFORM == ARTI_ARDUINO #if ARTI_PLATFORM == ARTI_ARDUINO
parseTreeJsonDoc = new DynamicJsonDocument(32768); //less memory on arduino: 32 vs 64 bit? parseTreeJsonDoc = new PSRAMDynamicJsonDocument(32768); //less memory on arduino: 32 vs 64 bit?
#else #else
parseTreeJsonDoc = new DynamicJsonDocument(65536); parseTreeJsonDoc = new PSRAMDynamicJsonDocument(65536);
#endif #endif
MEMORY_ARTI("parseTree %u => %u ✓\n", (unsigned int)parseTreeJsonDoc->capacity(), FREE_SIZE); MEMORY_ARTI("parseTree %u => %u ✓\n", (unsigned int)parseTreeJsonDoc->capacity(), FREE_SIZE);