Mirrors_Framework/PX4-Autopilot
1
0
Fork 0
mirror of https://github.com/PX4/PX4-Autopilot.git synced 2026-06-01 02:55:07 +08:00
Code Issues Actions 19 Packages Projects Releases Wiki Activity

libtunes: (bugfix) sending a custom msg tune overrides everything

Browse Source 
Custom msg tune can override any tune playing, regardless of the tune_override flag.
This commit is contained in:
Alessandro Simovic
2018-01-23 09:21:07 +01:00
committed by Beat Küng
parent 2acd431fcb
commit f47443f283
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/tunes/tunes.cpp
+7 -4
View File
@@ -92,10 +92,13 @@ int Tunes::set_control(const tune_control_s &tune_control)
if (tune_control.tune_id < _default_tunes_size) { if (tune_control.tune_id < _default_tunes_size) {
switch (tune_control.tune_id) { switch (tune_control.tune_id) {
case static_cast<int>(TuneID::CUSTOM): case static_cast<int>(TuneID::CUSTOM):
_frequency = (unsigned)tune_control.frequency; if (_tune == nullptr || tune_control.tune_override) {
_duration = (unsigned)tune_control.duration; _frequency = (unsigned)tune_control.frequency;
_silence = (unsigned)tune_control.silence; _duration = (unsigned)tune_control.duration;
_using_custom_msg = true; _silence = (unsigned)tune_control.silence;
_using_custom_msg = true;
}
break; break;
// tunes that have a high priority // tunes that have a high priority