Remove from favorites

Author: bmorcelli

README.md

@@ -79,6 +79,10 @@ Things that needs to be done in next updates
 
 
 ## Latest Changelog
+* 2.6.1:
+     * [x] Fixed T-Deck Plus touchscreen (added new env for it)
+     * [x] Fixed M5Stack CoreS3 SD Card not mounting
+     * [x] Add Delete from Favorites option
 
 * 2.6.0:
      * [x] Pulling data from my new api, integrating all devices list with m5burner api and counting downloads into the m5burner database.

src/display.cpp

@@ -1043,7 +1043,8 @@ void loopVersions(String _fid) {
                                    }});
                 options.push_back({"Add to Favorite", [=] {
                                        JsonObject fav = favorite.add<JsonObject>();
-                                       fav["name"] = String(name) + "-" + String(author);
+                                       fav["name"] = String(name) + " - " + String(author) + " (" +
+                                                     String(OTA_TAG) + ")";
                                        fav["fid"] = _fid;
                                        fav["link"] = "";
                                        saveConfigs();

src/onlineLauncher.cpp

@@ -161,18 +161,31 @@ void ota_function() {
         if (returnToMenu) return;
         if (fav) {
             int idx = 0;
-        RELOAD:
-            options.clear();
-            for (JsonObject item : favorite) {
-                if (item["fid"].as<String>().length() > 0) {
-                    options.push_back({item["name"].as<String>(), [=]() {
-                                           loopVersions(item["fid"].as<String>());
+            auto NavMenu = [&](int fw) {
+                options.clear();
+                if (favorite[fw]["fid"].as<String>().length() > 0) {
+                    options.push_back({"View firmware", [=]() {
+                                           loopVersions(favorite[fw]["fid"].as<String>());
                                        }});
                 } else {
-                    options.push_back({item["name"].as<String>(), [=]() {
-                                           installExtFirmware(item["link"].as<String>());
+                    options.push_back({"Install", [=]() {
+                                           installExtFirmware(favorite[fw]["link"].as<String>());
                                        }});
                 }
+                options.push_back({"Remove Favorite", [=]() {
+                                       favorite.remove(fw);
+                                       saveConfigs();
+                                   }});
+                options.push_back({"Back to List", [=]() { /* Do nothing, just return */ }});
+                options.push_back({"Main Menu", [=]() { returnToMenu = true; }});
+                loopOptions(options);
+            };
+        RELOAD:
+            options.clear();
+            int count = 0;
+            for (JsonObject item : favorite) {
+                options.push_back({item["name"].as<String>(), [=]() { NavMenu(count); }});
+                count++;
             }
             options.push_back({"Main Menu", [=]() { returnToMenu = true; }, ALCOLOR});
             idx = loopOptions(options, false, FGCOLOR, BGCOLOR, false, idx);
@@ -442,8 +455,8 @@ bool installExtFirmware(String url) {
         for (int i = 0x0; i <= 0x1A0; i += 0x20) { // Partition
             memcpy(bytes, &buff[i], 16);
 
-            // https://docs.espressif.com/projects/esp-idf/en/stable/esp32/api-guides/partition-tables.html ->
-            // spiffs (0x82) is for SPIFFS Filesystem.
+            // https://docs.espressif.com/projects/esp-idf/en/stable/esp32/api-guides/partition-tables.html
+            // -> spiffs (0x82) is for SPIFFS Filesystem.
 
             // if (bytes[3] == 0xFF) Serial.println(": ------- END of Table ------- |");
             if (bytes[3] == 0x00 || (bytes[3] >= 0x10 && bytes[3] <= 0x1F)) {