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.

Sign up for GitHub

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

removed some redundant lines #1494

Merged
merged 16 commits into from
Dec 13, 2022
Merged

removed some redundant lines #1494

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
e8cac79
removed some redundant lines
discip Dec 7, 2022
9966274
show correct message after factory reset_I
discip Dec 10, 2022
b26cfa3
show correct message after factory reset_II
discip Dec 10, 2022
ec3e89f
show correct message after factory reset_III
discip Dec 10, 2022
0a9b70d
show correct message after factory reset_IV
discip Dec 10, 2022
e2b1b14
show correct message after factory reset_V
discip Dec 10, 2022
372dac4
show correct message after factory reset_VI
discip Dec 10, 2022
ff08896
after reset go to home screen
discip Dec 10, 2022
110af42
after reset go to home screen_II
discip Dec 10, 2022
863f091
after reset go to home screen_III
discip Dec 10, 2022
c08b06b
after reset go to home screen_IV
discip Dec 10, 2022
b934cac
after reset go to home screen_V
discip Dec 10, 2022
74339a9
after reset go to home screen_VI
discip Dec 10, 2022
8a6b00f
reverting (go to home screen did not work)
discip Dec 10, 2022
2a7cacd
typo fix
discip Dec 10, 2022
b0b261f
large reset confirmation_I
discip Dec 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
show correct message after factory reset_I
  • Loading branch information
@discip
discip authored Dec 10, 2022
commit 9966274a3dd1286ff690f7dbba15ef7904d310be
2 changes: 1 addition & 1 deletion source/Core/Src/settingsGUI.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -719,7 +719,7 @@ static void displayPowerPulseDuration(void) { OLED::printNumber(getSettingValue(
static bool setResetSettings(void) {
if (userConfirmation(translatedString(Tr->SettingsResetWarning))) {
resetSettings();
warnUser(translatedString(Tr->SettingsResetMessage), 10 * TICKS_SECOND);
warnUser(translatedString(Tr->ResetOKMessage), 10 * TICKS_SECOND);
}
return false;
}
Expand Down