Change to using an animated SD card icon instead of a loading or saving popup #3294
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The loading animation was not working as intended, because a timer was only set once for the standard popup time. It needed to be set for a short duration, then set again once it runs out and an update is made. During the discovering of this, I created a better way to indicate loading, that doesn't block the name of the thing you are loading. It is a small SD card icon that shows up in the upper right corner. It only displays when loading time exceeds 350ms. Then it will display a static icon for 750ms. Then it will load an alternate SD card icon that has the empty inner portion filled with a checkerboard. Then it will alternate between the two images every 250 mm, causing a blink to occur every 500ms (2Hz). Also text reduced scrolling and blinking speeds slightly to make things easier to track and less distracting.
stellar-aria
requested changes
Jan 18, 2025
| int32_t workingAnimationCount; | ||
| char const* workingAnimationText; // NULL means animation not active | ||
| int32_t working_animation_count; | ||
| // char const* workingAnimationText; // NULL means animation not active |
There was a problem hiding this comment.
Suggested change
| // char const* workingAnimationText; // NULL means animation not active |
src/deluge/hid/display/oled.cpp
Outdated
| @@ -413,7 +433,7 @@ void OLED::removePopup() { | |||
|
|
|||
| oledPopupWidth = 0; | |||
| popupType = PopupType::NONE; | |||
| workingAnimationText = nullptr; | |||
| // workingAnimationText = nullptr; | |||
There was a problem hiding this comment.
Suggested change
| // workingAnimationText = nullptr; |
| if (workingAnimationText) { | ||
| workingAnimationCount = (workingAnimationCount + 1) & 3; | ||
| if (working_animation_count) { | ||
| // working_animation_count = (working_animation_count + 1) & 1; |
There was a problem hiding this comment.
Suggested change
| // working_animation_count = (working_animation_count + 1) & 1; |
| } | ||
|
|
||
| // if(workingAnimationText) return; |
There was a problem hiding this comment.
Suggested change
| // if(workingAnimationText) return; |
| } | ||
|
|
||
| error = textNow.concatenate(buffer); | ||
| OLED::popupText(textNow.get(), true, PopupType::LOADING); | ||
| } | ||
|
|
||
| void OLED::displayWorkingAnimation(char const* word) { |
There was a problem hiding this comment.
This signature will probably need to be changed if it's no longer valid...
Progress save, before possibly rolling back some changes to make the loading animation the default. Reverted scroll speed change
Changed clearing portion of animation. made description comments for all variables.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The loading animation was not working as intended, because a timer was only set once for the standard popup time. It needed to be set for a short duration, then set again once it runs out and an update is made. During the discovering of this, I created a better way to indicate loading, that doesn't block the name of the thing you are loading. I made a small SD card icon that shows up in the upper right corner. It only displays when loading or saving time exceeds 350ms. Then it will display a static icon for 750ms. Then it will load an alternate SD card icon that has the empty inner portion filled with a checkerboard. Then it will alternate between the two images every 250 ms, causing a blink to occur every 500ms (2Hz).
Also reduced text scrolling and light blinking speeds slightly to make things easier to track and less distracting.