mirror of
https://github.com/opentx/opentx.git
synced 2025-07-26 01:35:21 +03:00
Disable pulse while model notes are displayed (#5758)
* Implement model note view without menu handler. Use it before pulse starts * Also at model change. Handle wd reset and start pulses after mixer * Fix Horus compile * Fix Horus crash * Fix coding style issue
This commit is contained in:
parent
45804b318a
commit
13c5387dc9
7 changed files with 65 additions and 17 deletions
|
@ -72,17 +72,6 @@ void postModelLoad(bool alarms)
|
|||
AUDIO_FLUSH();
|
||||
flightReset(false);
|
||||
|
||||
if (pulsesStarted()) {
|
||||
#if defined(GUI)
|
||||
if (alarms) {
|
||||
checkAll();
|
||||
PLAY_MODEL_NAME();
|
||||
}
|
||||
#endif
|
||||
resumePulses();
|
||||
}
|
||||
|
||||
|
||||
customFunctionsReset();
|
||||
|
||||
restoreTimers();
|
||||
|
@ -100,7 +89,15 @@ void postModelLoad(bool alarms)
|
|||
LOAD_MODEL_CURVES();
|
||||
|
||||
resumeMixerCalculations();
|
||||
// TODO pulses should be started after mixer calculations ...
|
||||
if (pulsesStarted()) {
|
||||
#if defined(GUI)
|
||||
if (alarms) {
|
||||
checkAll();
|
||||
PLAY_MODEL_NAME();
|
||||
}
|
||||
#endif
|
||||
resumePulses();
|
||||
}
|
||||
|
||||
#if defined(TELEMETRY_FRSKY)
|
||||
frskySendAlarms();
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue