update
This commit is contained in:
@@ -21,7 +21,7 @@ void startLittleFS()
|
|||||||
{
|
{
|
||||||
#ifdef ULANZI
|
#ifdef ULANZI
|
||||||
LittleFS.mkdir("/MELODIES");
|
LittleFS.mkdir("/MELODIES");
|
||||||
#endif
|
#endif
|
||||||
LittleFS.mkdir("/ICONS");
|
LittleFS.mkdir("/ICONS");
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@@ -51,6 +51,11 @@ void loadDevSettings()
|
|||||||
BOOT_SOUND = doc["bootsound"].as<String>();
|
BOOT_SOUND = doc["bootsound"].as<String>();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (doc.containsKey("matrix"))
|
||||||
|
{
|
||||||
|
MATRIX_LAYOUT = doc["matrix"];
|
||||||
|
}
|
||||||
|
|
||||||
if (doc.containsKey("bootsound"))
|
if (doc.containsKey("bootsound"))
|
||||||
{
|
{
|
||||||
UPPERCASE_LETTERS = doc["uppercase"].as<bool>();
|
UPPERCASE_LETTERS = doc["uppercase"].as<bool>();
|
||||||
@@ -85,7 +90,7 @@ void loadSettings()
|
|||||||
#endif
|
#endif
|
||||||
SOUND_ACTIVE = Settings.getBool("SOUND", true);
|
SOUND_ACTIVE = Settings.getBool("SOUND", true);
|
||||||
#ifndef ULANZI
|
#ifndef ULANZI
|
||||||
//Settings.putUInt("VOL", VOLUME_PERCENT);
|
// Settings.putUInt("VOL", VOLUME_PERCENT);
|
||||||
VOLUME_PERCENT = Settings.getUInt("VOL", 50);
|
VOLUME_PERCENT = Settings.getUInt("VOL", 50);
|
||||||
VOLUME = map(VOLUME_PERCENT, 0, 100, 0, 30);
|
VOLUME = map(VOLUME_PERCENT, 0, 100, 0, 30);
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -59,11 +59,10 @@ void BootAnimation(void *parameter)
|
|||||||
|
|
||||||
void setup()
|
void setup()
|
||||||
{
|
{
|
||||||
|
|
||||||
PeripheryManager.setup();
|
|
||||||
delay(1000);
|
|
||||||
Serial.begin(115200);
|
|
||||||
loadSettings();
|
loadSettings();
|
||||||
|
Serial.begin(9600);
|
||||||
|
PeripheryManager.setup();
|
||||||
|
delay(500);
|
||||||
ServerManager.loadSettings();
|
ServerManager.loadSettings();
|
||||||
DisplayManager.setup();
|
DisplayManager.setup();
|
||||||
DisplayManager.HSVtext(9, 6, VERSION, true);
|
DisplayManager.HSVtext(9, 6, VERSION, true);
|
||||||
|
|||||||
Reference in New Issue
Block a user