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

fix(color): No startup/shutdown haptic if haptic mode set to quiet #4285

Merged
merged 4 commits into from
Nov 6, 2023
Merged

fix(color): No startup/shutdown haptic if haptic mode set to quiet #4285

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
15880b1
feat: No haptic if haptic mode quiet set
pfeerick Nov 5, 2023
11cfb48
fix(color): Reset LED color at end of throttle check
pfeerick Nov 5, 2023
7bb3b1f
fix(color): Read radio settings so haptic opt read
pfeerick Nov 5, 2023
e500bae
fix: hapticOff not option dependent
pfeerick Nov 5, 2023
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
30 changes: 22 additions & 8 deletions radio/src/opentx.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -909,8 +909,8 @@ void checkThrottleStick()
throttleNotIdle, STR_PRESS_ANY_KEY_TO_SKIP);
dialog->setCloseCondition([]() { return !isThrottleWarningAlertNeeded(); });
dialog->runForever();
LED_ERROR_END();
}
LED_ERROR_END();
}
#else
void checkThrottleStick()
Expand Down Expand Up @@ -1479,7 +1479,9 @@ void runStartupAnimation()
else if (!isPowerOn) {
isPowerOn = true;
pwrOn();
haptic.play(15, 3, PLAY_NOW);
#if defined(HAPTIC)
if (g_eeGeneral.hapticMode != e_mode_quiet) haptic.play(15, 3, PLAY_NOW);
#endif
}
}

Expand Down Expand Up @@ -1553,13 +1555,21 @@ void opentxInit()
lcdClear();
lcdRefresh();
lcdRefreshWait();
#endif

bool radioSettingsValid = storageReadRadioSettings(false);
(void)radioSettingsValid;
// Load radio.yml so radio settings can be used
bool radioSettingsValid = false;
#if defined(RTC_BACKUP_RAM)
// Skip loading if EM startup and radio has RTC backup data
if (!UNEXPECTED_SHUTDOWN())
radioSettingsValid = storageReadRadioSettings(false);
#else
// No RTC backup - try and load even for EM startup
radioSettingsValid = storageReadRadioSettings(false);
#endif

#if defined(GUI) && !defined(COLORLCD)
lcdSetContrast();
#endif
#endif

BACKLIGHT_ENABLE(); // we start the backlight during the startup animation
Expand All @@ -1573,7 +1583,9 @@ void opentxInit()
}
#else // defined(PWR_BUTTON_PRESS)
pwrOn();
haptic.play(15, 3, PLAY_NOW);
#if defined(HAPTIC)
if (g_eeGeneral.hapticMode != e_mode_quiet) haptic.play(15, 3, PLAY_NOW);
#endif
#endif

// Radios handle UNEXPECTED_SHUTDOWN() differently:
Expand Down Expand Up @@ -1917,8 +1929,10 @@ uint32_t pwrCheck()

#endif // COLORLCD
}

haptic.play(15, 3, PLAY_NOW);
#if defined(HAPTIC)
if (g_eeGeneral.hapticMode != e_mode_quiet)
haptic.play(15, 3, PLAY_NOW);
#endif
pwr_check_state = PWR_CHECK_OFF;
return e_power_off;
}
Expand Down