From 510ad00024a08a12509fefdbc81c692ceec391e5 Mon Sep 17 00:00:00 2001 From: Alessandro Simovic Date: Wed, 13 Apr 2022 22:51:53 +0200 Subject: [PATCH] dronecan beeper: remove unneded var --- src/drivers/uavcan/beep.cpp | 10 +++------- src/drivers/uavcan/beep.hpp | 1 - 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/src/drivers/uavcan/beep.cpp b/src/drivers/uavcan/beep.cpp index da5a65cba3..cb07b52f4b 100644 --- a/src/drivers/uavcan/beep.cpp +++ b/src/drivers/uavcan/beep.cpp @@ -72,17 +72,13 @@ void UavcanBeepController::periodic_update(const uavcan::TimerEvent &) _tune_control_sub.copy(&_tune); if (_tune.timestamp > 0) { - Tunes::ControlResult result = _tunes.set_control(_tune); - - if (result == Tunes::ControlResult::Success) { - _play_tone = true; - } + _tunes.set_control(_tune); } } const hrt_abstime timestamp_now = hrt_absolute_time(); - if ((timestamp_now - _interval_timestamp <= _duration) || !_play_tone) { + if ((timestamp_now - _interval_timestamp <= _duration)) { return; } @@ -92,7 +88,7 @@ void UavcanBeepController::periodic_update(const uavcan::TimerEvent &) _duration = _silence_length; _silence_length = 0; - } else if (_play_tone && (_tunes.get_next_note(_frequency, _duration, _silence_length) == Tunes::Status::Continue)) { + } else if (_tunes.get_next_note(_frequency, _duration, _silence_length) == Tunes::Status::Continue) { // Start playing the note. // A frequency of 0 corresponds to ToneAlarmInterface::stop_note() diff --git a/src/drivers/uavcan/beep.hpp b/src/drivers/uavcan/beep.hpp index 1ce9a0d035..691afd7e19 100644 --- a/src/drivers/uavcan/beep.hpp +++ b/src/drivers/uavcan/beep.hpp @@ -87,7 +87,6 @@ private: hrt_abstime _interval_timestamp{0}; tune_control_s _tune{}; Tunes _tunes{}; - bool _play_tone{false}; unsigned int _silence_length{0}; ///< If nonzero, silence before next note. unsigned int _frequency{0}; unsigned int _duration{0};