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:
3djc
2018-06-09 11:34:56 +02:00
committed by Bertrand Songis
parent 45804b318a
commit 13c5387dc9
7 changed files with 65 additions and 17 deletions
+9 -12
View File
@@ -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();