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

tunes: Improve logic for interrupting tunes

Browse Source 
src/lib/tunes already knows which tunes are interruptable, so add
return values to expose than and use than in tone_alarm.
This fixes the issue that repeating tunes cannot be interrupted without
tune_override set to true.

Signed-off-by: Alex Mikhalev <alex@corvus-robotics.com>
This commit is contained in:
Alex Mikhalev
2020-11-30 16:56:13 -05:00
committed by Kabir Mohammed
parent bd943d872c
commit 378b41af6a
4 changed files with 86 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/drivers/tone_alarm/ToneAlarm.cpp
+66 -50
View File
@@ -99,76 +99,92 @@ void ToneAlarm::Run()
if (_tune_control_sub.copy(&tune_control)) {
if (tune_control.timestamp > 0) {
if (!_play_tone || (_play_tone && tune_control.tune_override)) {
Tunes::ControlResult tune_result = _tunes.set_control(tune_control);
switch (tune_result) {
case Tunes::ControlResult::Success:
PX4_DEBUG("new tune %d", tune_control.tune_id);
if (_tunes.set_control(tune_control) == PX4_OK) {
if (tune_control.tune_override) {
// clear existing
ToneAlarmInterface::stop_note();
_next_note_time = 0;
hrt_cancel(&_hrt_call);
}
if (tune_control.tune_override) {
// clear existing
ToneAlarmInterface::stop_note();
_next_note_time = 0;
hrt_cancel(&_hrt_call);
}
_play_tone = true;
_play_tone = true;
#if (!defined(TONE_ALARM_TIMER) && !defined(GPIO_TONE_ALARM_GPIO)) || defined(DEBUG_BUILD)
switch (tune_control.tune_id) {
case tune_control_s::TUNE_ID_STARTUP:
PX4_INFO("startup tune");
break;
switch (tune_control.tune_id) {
case tune_control_s::TUNE_ID_STARTUP:
PX4_INFO("startup tune");
break;
case tune_control_s::TUNE_ID_ERROR:
PX4_ERR("error tune");
break;
case tune_control_s::TUNE_ID_ERROR:
PX4_ERR("error tune");
break;
case tune_control_s::TUNE_ID_NOTIFY_POSITIVE:
PX4_INFO("notify positive");
break;
case tune_control_s::TUNE_ID_NOTIFY_POSITIVE:
PX4_INFO("notify positive");
break;
case tune_control_s::TUNE_ID_NOTIFY_NEUTRAL:
PX4_INFO("notify neutral");
break;
case tune_control_s::TUNE_ID_NOTIFY_NEUTRAL:
PX4_INFO("notify neutral");
break;
case tune_control_s::TUNE_ID_NOTIFY_NEGATIVE:
PX4_ERR("notify negative");
break;
case tune_control_s::TUNE_ID_NOTIFY_NEGATIVE:
PX4_ERR("notify negative");
break;
case tune_control_s::TUNE_ID_ARMING_WARNING:
PX4_WARN("arming warning");
break;
case tune_control_s::TUNE_ID_ARMING_WARNING:
PX4_WARN("arming warning");
break;
case tune_control_s::TUNE_ID_BATTERY_WARNING_SLOW:
PX4_WARN("battery warning (slow)");
break;
case tune_control_s::TUNE_ID_BATTERY_WARNING_SLOW:
PX4_WARN("battery warning (slow)");
break;
case tune_control_s::TUNE_ID_BATTERY_WARNING_FAST:
PX4_WARN("battery warning (fast)");
break;
case tune_control_s::TUNE_ID_BATTERY_WARNING_FAST:
PX4_WARN("battery warning (fast)");
break;
case tune_control_s::TUNE_ID_ARMING_FAILURE:
PX4_ERR("arming failure");
break;
case tune_control_s::TUNE_ID_ARMING_FAILURE:
PX4_ERR("arming failure");
break;
case tune_control_s::TUNE_ID_SINGLE_BEEP:
PX4_WARN("beep");
break;
case tune_control_s::TUNE_ID_SINGLE_BEEP:
PX4_WARN("beep");
break;
case tune_control_s::TUNE_ID_HOME_SET:
PX4_INFO("home set");
break;
}
#endif // (!TONE_ALARM_TIMER && !GPIO_TONE_ALARM_GPIO) || DEBUG_BUILD
case tune_control_s::TUNE_ID_HOME_SET:
PX4_INFO("home set");
break;
}
} else if (_play_tone && !tune_control.tune_override) {
#endif // (!TONE_ALARM_TIMER && !GPIO_TONE_ALARM_GPIO) || DEBUG_BUILD
break;
case Tunes::ControlResult::WouldInterrupt:
// otherwise re-publish tune to process next
PX4_DEBUG("tune already playing, requeing tune: %d", tune_control.tune_id);
uORB::Publication<tune_control_s> tune_control_pub{ORB_ID(tune_control)};
tune_control.timestamp = hrt_absolute_time();
tune_control_pub.publish(tune_control);
{
uORB::Publication<tune_control_s> tune_control_pub{ORB_ID(tune_control)};
tune_control.timestamp = hrt_absolute_time();
tune_control_pub.publish(tune_control);
}
break;
case Tunes::ControlResult::InvalidTune:
PX4_WARN("Invalid tune: %d", tune_control.tune_id);
break;
case Tunes::ControlResult::AlreadyPlaying:
// Do nothing
break;
}
}
}
src/lib/tunes/tunes.cpp
+5 -4
View File
@@ -78,11 +78,11 @@ void Tunes::reset(bool repeat_flag)
_tempo = _default_tempo;
}
int Tunes::set_control(const tune_control_s &tune_control)
Tunes::ControlResult Tunes::set_control(const tune_control_s &tune_control)
{
// Sanity check
if (tune_control.tune_id >= _default_tunes_size) {
return -EINVAL;
return ControlResult::InvalidTune;
}
// Accept new tune or a stop?
@@ -93,7 +93,7 @@ int Tunes::set_control(const tune_control_s &tune_control)
// Check if this exact tune is already being played back
if (tune_control.tune_id != static_cast<int>(TuneID::CUSTOM) &&
_tune == _default_tunes[tune_control.tune_id]) {
return OK; // Nothing to do
return ControlResult::AlreadyPlaying; // Nothing to do
}
// Reset repeat flag. Can jump to true again while tune is being parsed later
@@ -126,9 +126,10 @@ int Tunes::set_control(const tune_control_s &tune_control)
}
_current_tune_id = tune_control.tune_id;
return ControlResult::Success;
}
return OK;
return ControlResult::WouldInterrupt;
}
void Tunes::set_string(const char *const string, uint8_t volume)
src/lib/tunes/tunes.h
+13 -2
View File
@@ -37,6 +37,7 @@
#pragma once
#include <errno.h>
#include <uORB/uORB.h>
#include <uORB/topics/tune_control.h>
#include "tune_definition.h"
@@ -64,6 +65,13 @@ public:
Error = -1,
};
enum class ControlResult {
Success = 0,
AlreadyPlaying = 1,
InvalidTune = -EINVAL,
WouldInterrupt = -EBUSY,
};
/**
* Constructor with the default parameters set to:
* default_tempo: TUNE_DEFAULT_TEMPO
@@ -83,9 +91,12 @@ public:
* the call to this function will be ignored, unless the override flag is set
* or the tune being already played is a repeated tune.
* @param tune_control struct containig the uORB message
* @return return -EINVAL if the default tune does not exist.
* @return return ControlResult::InvalidTune if the default tune does not exist,
* ControlResult::WouldInterrupt if tune was already playing and not interruptable,
* ControlResult::AlreadyPlaying if same tune was already playing,
* ControlResult::Success if new tune was set.
*/
int set_control(const tune_control_s &tune_control);
ControlResult set_control(const tune_control_s &tune_control);
/**
* Set tune to be played using a string.
src/systemcmds/tune_control/tune_control.cpp
+2 -2
View File
@@ -187,9 +187,9 @@ extern "C" __EXPORT int tune_control_main(int argc, char *argv[])
}
} else if (!strcmp(argv[myoptind], "libtest")) {
int ret = tunes.set_control(tune_control);
Tunes::ControlResult ret = tunes.set_control(tune_control);
if (ret == -EINVAL) {
if (ret == Tunes::ControlResult::InvalidTune) {
PX4_WARN("Tune ID not recognized.");
}