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

Info page optimizations

Browse Source 
* reduce from 3 lines to two lines
* don't add to info when usermod is disabled in UM settings
* show current playlist id
This commit is contained in:
Frank
2024-04-16 17:57:31 +02:00
parent acfbe890b3
commit d42148d994
1 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
usermods/usermod_v2_auto_playlist/usermod_v2_auto_playlist.h
View File

@@ -346,16 +346,26 @@ class AutoPlaylistUsermod : public Usermod {
user = root.createNestedObject("u"); user = root.createNestedObject("u");
} }
JsonArray infoArr = user.createNestedArray(FPSTR(_name)); // name if (!enabled) return; // usermod disabled -> don't add to info page
String uiDomString = F(""); String uiNameString = FPSTR(_name);
if (enabled && functionality_enabled) { if (enabled && functionality_enabled) {
uiDomString += F("AutoPlaylist is Running"); uiNameString += F(" Running");
} else if (!enabled) { } else if (!enabled) {
uiDomString += F("AutoPlaylist is Disabled"); uiNameString += F(" Disabled");
} else { } else {
uiDomString += F("AutoPlaylist is Suspended"); uiNameString += F(" Suspended");
}
JsonArray infoArr = user.createNestedArray(uiNameString); // name + status
String uiDomString = (currentPlaylist > 0) ? String("#") + String(currentPlaylist) + String(" ") : String("");
if (currentPlaylist == musicPlaylist && currentPlaylist > 0) {
uiDomString += F("Music Playlist");
} else if (currentPlaylist == ambientPlaylist && currentPlaylist > 0) {
uiDomString += F("Ambient Playlist");
} else {
uiDomString += F("Playlist Overridden");
} }
uiDomString += F("<br />"); uiDomString += F("<br />");
@@ -367,16 +377,6 @@ class AutoPlaylistUsermod : public Usermod {
} else if (!autoChange) { } else if (!autoChange) {
uiDomString += F("AutoChange is Disabled"); uiDomString += F("AutoChange is Disabled");
} }
uiDomString += F("<br />");
if (currentPlaylist == musicPlaylist && currentPlaylist > 0) {
uiDomString += F("Playlist: Music Playlist");
} else if (currentPlaylist == ambientPlaylist && currentPlaylist > 0) {
uiDomString += F("Playlist: Ambient Playlist");
} else {
uiDomString += F("Playlist: Overridden");
}
// #ifdef USERMOD_AUTO_PLAYLIST_DEBUG // #ifdef USERMOD_AUTO_PLAYLIST_DEBUG
// uiDomString += F("<br />"); // uiDomString += F("<br />");