Skip to content

Commit

Permalink
Update genres and remove sort modes
Browse files Browse the repository at this point in the history
Some new genre playlists were added to The Sounds of Spotify after
updates to everynoise.com had ceased. I was able to approximate the
colors for these genres based on existing data, but am removing the sort
modes as rankings are not available and more likely to become stale.
  • Loading branch information
quadule committed Nov 24, 2024
1 parent 87f96e5 commit 580c718
Show file tree
Hide file tree
Showing 8 changed files with 13 additions and 44 deletions.
2 changes: 1 addition & 1 deletion readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ https://user-images.githubusercontent.com/15299/221440478-d7a543d5-4e82-4146-b03
* Hold the knob for couple seconds for a random genre, country, or playlist from the last open menu.
- Keep holding the knob until the progress bar reaches the end to play immediately.
- Release the knob before the progress bar reaches the end to keep browsing.
* When browsing genres, double click the knob to switch sort modes: _name_ (the default alphabetical order), _suffix_, _ambience_, _modernity_, and _popularity_.
* When browsing genres, double click the knob to switch between the default alphabetical order and sorting by suffix.
* When playing something, double click the knob to skip to the next track.

### Requirements
Expand Down
2 changes: 1 addition & 1 deletion setup/firmware/knobby/manifest.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "knobby",
"version": "2024.03.09",
"version": "2024.11.24",
"builds": [
{
"chipFamily": "ESP32",
Expand Down
2 changes: 1 addition & 1 deletion setup/firmware/tdisplay-s3/manifest.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "knobby",
"version": "2024.03.09",
"version": "2024.11.24",
"builds": [
{
"chipFamily": "ESP32-S3",
Expand Down
2 changes: 1 addition & 1 deletion setup/firmware/tembed/manifest.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "knobby",
"version": "2024.03.09",
"version": "2024.11.24",
"builds": [
{
"chipFamily": "ESP32-S3",
Expand Down
2 changes: 1 addition & 1 deletion setup/firmware/twatch/manifest.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "knobby",
"version": "2024.03.09",
"version": "2024.11.24",
"builds": [
{
"chipFamily": "ESP32",
Expand Down
19 changes: 6 additions & 13 deletions src/genres.h

Large diffs are not rendered by default.

21 changes: 0 additions & 21 deletions src/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -999,15 +999,6 @@ void knobDoubleClicked() {
case AlphabeticSuffixSort:
setStatusMessage("sort by suffix");
break;
case AmbienceSort:
setStatusMessage("sort by ambience");
break;
case ModernitySort:
setStatusMessage("sort by modernity");
break;
case PopularitySort:
setStatusMessage("sort by popularity");
break;
}
} else if (menuMode == SettingsMenu) {
switch (menuIndex) {
Expand Down Expand Up @@ -1920,12 +1911,6 @@ int getGenreIndexForMenuIndex(uint16_t index, MenuModes mode) {
return index;
case AlphabeticSuffixSort:
return genreIndexes_suffix[index];
case AmbienceSort:
return genreIndexes_background[index];
case ModernitySort:
return genreIndexes_modernity[index];
case PopularitySort:
return genreIndexes_popularity[index];
default:
return index;
}
Expand Down Expand Up @@ -1957,12 +1942,6 @@ uint16_t getMenuIndexForGenreIndex(uint16_t index) {
return index;
case AlphabeticSuffixSort:
return getIndexOfGenreIndex(genreIndexes_suffix, index);
case AmbienceSort:
return getIndexOfGenreIndex(genreIndexes_background, index);
case ModernitySort:
return getIndexOfGenreIndex(genreIndexes_modernity, index);
case PopularitySort:
return getIndexOfGenreIndex(genreIndexes_popularity, index);
default:
return index;
}
Expand Down
7 changes: 2 additions & 5 deletions src/main.h
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,9 @@ enum MenuModes {
};
enum GenreSortModes {
AlphabeticSort = 0,
AlphabeticSuffixSort = 1,
AmbienceSort = 2,
ModernitySort = 3,
PopularitySort = 4
AlphabeticSuffixSort = 1
};
const int genreSortModesCount = 5;
const int genreSortModesCount = 2;
enum NowPlayingItems {
LikeButton = 0,
ShuffleButton = 1,
Expand Down

0 comments on commit 580c718

Please sign in to comment.