Mirrors_Framework/PX4-Autopilot
1
0
Fork 0
mirror of https://github.com/PX4/PX4-Autopilot.git synced 2026-05-28 02:36:37 +08:00
Code Issues Actions 32 Packages Projects Releases Wiki Activity

Merge pull request #12063 from PX4/fix_custom_tune

Browse Source 
fix tunes: make sure a custom tune gets played
This commit is contained in:
Beat Küng
2019-05-25 17:58:44 +02:00
committed by Lorenz Meier
parent 9ab9a29a01
commit 800266741b
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/tunes/tunes.cpp
+1 -1
View File
@@ -178,7 +178,7 @@ int Tunes::get_next_note(unsigned &frequency, unsigned &duration,
duration = _duration; duration = _duration;
frequency = _frequency; frequency = _frequency;
silence = _silence; silence = _silence;
return TUNE_STOP; return TUNE_CONTINUE;
} }
// Make sure we still have a tune. // Make sure we still have a tune.
src/lib/tunes/tunes.h
+1 -1
View File
@@ -108,7 +108,7 @@ public:
* @param duration return duration of the note (us) * @param duration return duration of the note (us)
* @param silence return silence duration (us) * @param silence return silence duration (us)
* @param volume return the volume level of the note (between 0-100) * @param volume return the volume level of the note (between 0-100)
* @return -1 for error, 0 for play one tone and 1 for continue a sequence * @return -1 for no tune available/error, 0 to not play anything and 1 to play
*/ */
int get_next_note(unsigned &frequency, unsigned &duration, int get_next_note(unsigned &frequency, unsigned &duration,
unsigned &silence, uint8_t &volume); unsigned &silence, uint8_t &volume);