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

libtunes: added tone strength as state and output to libtunes

Browse Source 
Since the tune library also contains logic how tunes can be overriden,
a user of the tunes library cannot know the strength of the current tune
without replicating some logic. Easy solution is to add strength to the
output of Tunes::get_next_tune().
This commit is contained in:
Alessandro Simovic
2018-03-26 14:54:23 +02:00
committed by Beat Küng
parent acdc81ea0a
commit 6ce839ea1e
3 changed files with 41 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/systemcmds/tune_control/tune_control.cpp
+6 -4
View File
@@ -170,7 +170,7 @@ tune_control_main(int argc, char *argv[])
return 1;
}
unsigned frequency, duration, silence;
unsigned frequency, duration, silence, strength;
int exit_counter = 0;
if (!strcmp(argv[myoptind], "play")) {
@@ -178,11 +178,12 @@ tune_control_main(int argc, char *argv[])
PX4_INFO("Start playback...");
tunes.set_string(tune_string);
while (tunes.get_next_tune(frequency, duration, silence) > 0) {
while (tunes.get_next_tune(frequency, duration, silence, strength) > 0) {
tune_control.tune_id = 0;
tune_control.frequency = (uint16_t)frequency;
tune_control.duration = (uint32_t)duration;
tune_control.silence = (uint32_t)silence;
tune_control.strength = (uint32_t)strength;
publish_tune_control(tune_control);
usleep(duration + silence);
exit_counter++;
@@ -207,8 +208,9 @@ tune_control_main(int argc, char *argv[])
} else if (!strcmp(argv[myoptind], "libtest")) {
tunes.set_control(tune_control);
while (tunes.get_next_tune(frequency, duration, silence) > 0) {
PX4_INFO("frequency: %d, duration %d, silence %d", frequency, duration, silence);
while (tunes.get_next_tune(frequency, duration, silence, strength) > 0) {
PX4_INFO("frequency: %d, duration %d, silence %d, strength%d",
frequency, duration, silence, strength);
usleep(500000);
exit_counter++;