Merge pull request #12063 from PX4/fix_custom_tune

fix tunes: make sure a custom tune gets played
PX4 · May 25, 2019 · 8002667 · 8002667
1 parent 9ab9a29
commit 8002667
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/lib/tunes/tunes.cpp b/src/lib/tunes/tunes.cpp
@@ -178,7 +178,7 @@ int Tunes::get_next_note(unsigned &frequency, unsigned &duration,
 		duration  = _duration;
 		frequency = _frequency;
 		silence   = _silence;
-		return TUNE_STOP;
+		return TUNE_CONTINUE;
 	}
 
 	// Make sure we still have a tune.

diff --git a/src/lib/tunes/tunes.h b/src/lib/tunes/tunes.h
@@ -108,7 +108,7 @@ class Tunes
 	 * @param  duration  return duration of the note (us)
 	 * @param  silence   return silence duration (us)
 	 * @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,
 			  unsigned &silence, uint8_t &volume);