Mirrors_Framework/PX4-Autopilot
1
0
Fork 0
mirror of https://github.com/PX4/PX4-Autopilot.git synced 2026-05-27 10:17:45 +08:00
Code Issues Actions 21 Packages Projects Releases Wiki Activity

Dronecan fix beep driver

Browse Source
This commit is contained in:
alexklimaj
2021-12-12 19:16:28 -07:00
committed by Daniel Agar
parent 67a893ac6d
commit 6133ef0d63
1 changed files with 12 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/drivers/uavcan/beep.cpp
+12 -19
View File
@@ -45,7 +45,7 @@ UavcanBeep::UavcanBeep(uavcan::INode &node) :
_beep_pub(node), _beep_pub(node),
_timer(node) _timer(node)
{ {
_beep_pub.setPriority(uavcan::TransferPriority::Default); _beep_pub.setPriority(uavcan::TransferPriority::MiddleLower);
} }
int UavcanBeep::init() int UavcanBeep::init()
@@ -73,7 +73,10 @@ void UavcanBeep::periodic_update(const uavcan::TimerEvent &)
if (_tune.timestamp > 0) { if (_tune.timestamp > 0) {
Tunes::ControlResult result = _tunes.set_control(_tune); Tunes::ControlResult result = _tunes.set_control(_tune);
_play_tone = (result == Tunes::ControlResult::Success) || (result == Tunes::ControlResult::AlreadyPlaying);
if (result == Tunes::ControlResult::Success) {
_play_tone = true;
}
} }
} }
@@ -89,23 +92,13 @@ void UavcanBeep::periodic_update(const uavcan::TimerEvent &)
_duration = _silence_length; _duration = _silence_length;
_silence_length = 0; _silence_length = 0;
} else if (_play_tone) { } else if (_play_tone && (_tunes.get_next_note(_frequency, _duration, _silence_length) == Tunes::Status::Continue)) {
Tunes::Status parse_ret_val = _tunes.get_next_note(_frequency, _duration, _silence_length);
if (parse_ret_val == Tunes::Status::Continue) { // Start playing the note.
// Continue playing. // A frequency of 0 corresponds to ToneAlarmInterface::stop_note()
_play_tone = true; uavcan::equipment::indication::BeepCommand cmd{};
cmd.frequency = _frequency;
if (_frequency > 0) { cmd.duration = _duration / 1000000.f;
// Start playing the note. _beep_pub.broadcast(cmd);
uavcan::equipment::indication::BeepCommand cmd{};
cmd.frequency = _frequency;
cmd.duration = _duration / 1000000.f;
_beep_pub.broadcast(cmd);
}
} else {
_play_tone = false;
}
} }
} }