fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-21 04:03:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Rename Tunes::get_next_tune() to Tunes::get_next_note().

Browse Source
This commit is contained in:
mcsauder
2019-02-19 08:00:11 +01:00
committed by Beat Küng
parent 18f7ee2d50
commit a6d186dfed
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/tunes/tunes.cpp
+3 -3
View File
@@ -147,10 +147,10 @@ void Tunes::set_string(const char *const string, uint8_t strength)
}
}
int Tunes::get_next_tune(unsigned &frequency, unsigned &duration,
int Tunes::get_next_note(unsigned &frequency, unsigned &duration,
unsigned &silence, uint8_t &strength)
{
int ret = get_next_tune(frequency, duration, silence);
int ret = get_next_note(frequency, duration, silence);
// Check if note should not be heard -> adjust strength to 0 to be safe.
if (frequency == 0 || duration == 0) {
@@ -163,7 +163,7 @@ int Tunes::get_next_tune(unsigned &frequency, unsigned &duration,
return ret;
}
int Tunes::get_next_tune(unsigned &frequency, unsigned &duration,
int Tunes::get_next_note(unsigned &frequency, unsigned &duration,
unsigned &silence)
{
// Return the values for frequency and duration if the custom msg was received.
src/lib/tunes/tunes.h
+2 -2
View File
@@ -100,7 +100,7 @@ public:
* @param silence return silence duration (us)
* @return -1 for error, 0 for play one tone and 1 for continue a sequence
*/
int get_next_tune(unsigned &frequency, unsigned &duration, unsigned &silence);
int get_next_note(unsigned &frequency, unsigned &duration, unsigned &silence);
/**
* Get next note in the current tune, which has been provided by either
@@ -111,7 +111,7 @@ public:
* @param strength return the strength of the note (between 0-100)
* @return -1 for error, 0 for play one tone and 1 for continue a sequence
*/
int get_next_tune(unsigned &frequency, unsigned &duration,
int get_next_note(unsigned &frequency, unsigned &duration,
unsigned &silence, uint8_t &strength);
/**