From 0ca49bd4074362891dbdffd259e67c291be2e4d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20M=C3=BChl?= <31169771+Blueforcer@users.noreply.github.com> Date: Mon, 3 Apr 2023 14:28:00 +0200 Subject: [PATCH] update --- src/Globals.cpp | 9 +++++++-- src/main.cpp | 7 +++---- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/Globals.cpp b/src/Globals.cpp index c7272f0..14177d4 100644 --- a/src/Globals.cpp +++ b/src/Globals.cpp @@ -21,7 +21,7 @@ void startLittleFS() { #ifdef ULANZI LittleFS.mkdir("/MELODIES"); -#endif +#endif LittleFS.mkdir("/ICONS"); } else @@ -51,6 +51,11 @@ void loadDevSettings() BOOT_SOUND = doc["bootsound"].as(); } + if (doc.containsKey("matrix")) + { + MATRIX_LAYOUT = doc["matrix"]; + } + if (doc.containsKey("bootsound")) { UPPERCASE_LETTERS = doc["uppercase"].as(); @@ -85,7 +90,7 @@ void loadSettings() #endif SOUND_ACTIVE = Settings.getBool("SOUND", true); #ifndef ULANZI - //Settings.putUInt("VOL", VOLUME_PERCENT); + // Settings.putUInt("VOL", VOLUME_PERCENT); VOLUME_PERCENT = Settings.getUInt("VOL", 50); VOLUME = map(VOLUME_PERCENT, 0, 100, 0, 30); #endif diff --git a/src/main.cpp b/src/main.cpp index 61ff61b..391cf4d 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -59,11 +59,10 @@ void BootAnimation(void *parameter) void setup() { - - PeripheryManager.setup(); - delay(1000); - Serial.begin(115200); loadSettings(); + Serial.begin(9600); + PeripheryManager.setup(); + delay(500); ServerManager.loadSettings(); DisplayManager.setup(); DisplayManager.HSVtext(9, 6, VERSION, true);