Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Infinite logo #1309

Merged
merged 3 commits into from
Jun 16, 2022
Merged

Infinite logo #1309

merged 3 commits into from
Jun 16, 2022

Conversation

Ralim
Copy link
Owner

@Ralim Ralim commented Jun 8, 2022

  • Please check if the PR fulfills these requirements
  • The changes have been tested locally
  • There are no breaking changes (I hope)
  • What kind of change does this PR introduce?
    Fixes the infinite delay setting for the bootup logo

#1285

@Ralim Ralim added this to the 2.19 milestone Jun 8, 2022
@discip
Copy link
Collaborator

discip commented Jun 8, 2022

Just to confirm:
This still works for the TS80P as intended! 👍

// Delay here until button is pressed or its been the amount of seconds set by the user
waitForButtonPressOrTimeout(TICKS_SECOND * getSettingValue(SettingsOptions::LOGOTime));
delay();
return;
}
} while (buttons == BUTTON_NONE);
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Ralim
Good morning Sir,

nice to hear from you again! 😃😊

Hopefully you are doing well!

Now to the code.
Isn’t this line enough?
What does your approach do to make the code more reliable?
No accusation or sarcasm, just trying to understand. You know I’m not that good in this field.

Copy link
Owner Author

@Ralim Ralim Jun 9, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hahah dont worry I've not gone anywhere; just been poking other projects for a bit of a break.

So I just added the case for if the timeout is 5; then we use the waitForButtonPress instead since we dont want a timeout.

( I should note its basically the same for the new logo path, I think its just the old logo path that had issues but i didnt dig)

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Alright! 👍

Ah, I see.
So, am I right about the do-while-loop being redundant?

@Ralim Ralim merged commit f5cb42c into dev Jun 16, 2022
@Ralim Ralim deleted the infinite-logo branch June 16, 2022 10:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants