Merge branch 'development' into main

src/Globals.cpp

@@ -1,6 +1,8 @@
 #include "Globals.h"
 #include "Preferences.h"
 #include <WiFi.h>
+#include <ArduinoJson.h>
+#include <LittleFS.h>
 
 Preferences Settings;
 
@@ -13,8 +15,48 @@ char *getID()
     return macStr;
 }
 
+void startLittleFS()
+{
+    if (LittleFS.begin())
+    {
+        LittleFS.mkdir("/MELODIES");
+        LittleFS.mkdir("/ICONS");
+    }
+    else
+    {
+        Serial.println("ERROR on mounting LittleFS. It will be formmatted!");
+        LittleFS.format();
+        ESP.restart();
+    }
+}
+
+void loadDevSettings()
+{
+    Serial.println("laodSettings");
+    File file = LittleFS.open("/dev.json", "r");
+    if (!file)
+    {
+        return;
+    }
+    DynamicJsonDocument doc(128);
+    DeserializationError error = deserializeJson(doc, file);
+    if (error)
+    {
+        Serial.println(F("Failed to read dev settings"));
+        return;
+    }
+
+    if (doc.containsKey("bootsound"))
+    {
+        BOOT_SOUND = doc["bootsound"].as<String>();
+    }
+
+    file.close();
+}
+
 void loadSettings()
 {
+    startLittleFS();
     Settings.begin("awtrix", false);
     MATRIX_FPS = Settings.getUChar("FPS", 23);
     BRIGHTNESS = Settings.getUChar("BRI", 120);
@@ -34,9 +76,11 @@ void loadSettings()
 #ifdef ULANZI
     SHOW_BAT = Settings.getBool("BAT", true);
 #endif
+    SOUND_ACTIVE = Settings.getBool("SOUND", true);
     Settings.end();
     uniqueID = getID();
     MQTT_PREFIX = String(uniqueID);
+    loadDevSettings();
 }
 
 void saveSettings()
@@ -60,6 +104,8 @@ void saveSettings()
 #ifdef ULANZI
     Settings.putBool("BAT", SHOW_BAT);
 #endif
+=======
+    Settings.putBool("SOUND", SOUND_ACTIVE);
     Settings.end();
 }
 
@@ -130,4 +176,6 @@ bool AP_MODE;
 bool MATRIX_OFF;
 bool TIMER_ACTIVE;
 bool ALARM_ACTIVE;
-uint16_t TEXTCOLOR_565 = 0xFFFF;
+uint16_t TEXTCOLOR_565 = 0xFFFF;
+bool SOUND_ACTIVE;
+String BOOT_SOUND = "";