Mirrors_Framework/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2026-06-02 11:08:06 +08:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

[rtttl] Code Improvements (#13653)

Browse Source 
Co-authored-by: Keith Burzinski <kbx81x@gmail.com>
This commit is contained in:
Thomas Rupprecht
2026-02-11 04:10:29 +01:00
committed by GitHub
parent 58659e4893
commit 42bc0994f1
2 changed files with 239 additions and 228 deletions
Download Patch File Download Diff File Expand all files Collapse all files
esphome/components/rtttl/rtttl.cpp
+216 -196
View File
File diff suppressed because it is too large Load Diff
esphome/components/rtttl/rtttl.h
+23 -32
View File
@@ -5,48 +5,41 @@
#ifdef USE_OUTPUT #ifdef USE_OUTPUT
#include "esphome/components/output/float_output.h" #include "esphome/components/output/float_output.h"
#endif #endif // USE_OUTPUT
#ifdef USE_SPEAKER #ifdef USE_SPEAKER
#include "esphome/components/speaker/speaker.h" #include "esphome/components/speaker/speaker.h"
#endif #endif // USE_SPEAKER
namespace esphome { namespace esphome::rtttl {
namespace rtttl {
enum State : uint8_t { enum class State : uint8_t {
STATE_STOPPED = 0, STOPPED = 0,
STATE_INIT, INIT,
STATE_STARTING, STARTING,
STATE_RUNNING, RUNNING,
STATE_STOPPING, STOPPING,
}; };
#ifdef USE_SPEAKER
static const size_t SAMPLE_BUFFER_SIZE = 2048;
struct SpeakerSample {
int8_t left{0};
int8_t right{0};
};
#endif
class Rtttl : public Component { class Rtttl : public Component {
public: public:
#ifdef USE_OUTPUT #ifdef USE_OUTPUT
void set_output(output::FloatOutput *output) { this->output_ = output; } void set_output(output::FloatOutput *output) { this->output_ = output; }
#endif #endif // USE_OUTPUT
#ifdef USE_SPEAKER #ifdef USE_SPEAKER
void set_speaker(speaker::Speaker *speaker) { this->speaker_ = speaker; } void set_speaker(speaker::Speaker *speaker) { this->speaker_ = speaker; }
#endif #endif // USE_SPEAKER
float get_gain() { return gain_; }
void set_gain(float gain) { this->gain_ = clamp(gain, 0.0f, 1.0f); } void dump_config() override;
void loop() override;
void play(std::string rtttl); void play(std::string rtttl);
void stop(); void stop();
void dump_config() override;
bool is_playing() { return this->state_ != State::STATE_STOPPED; } float get_gain() { return this->gain_; }
void loop() override; void set_gain(float gain) { this->gain_ = clamp(gain, 0.0f, 1.0f); }
bool is_playing() { return this->state_ != State::STOPPED; }
void add_on_finished_playback_callback(std::function<void()> callback) { void add_on_finished_playback_callback(std::function<void()> callback) {
this->on_finished_playback_callback_.add(std::move(callback)); this->on_finished_playback_callback_.add(std::move(callback));
@@ -90,12 +83,12 @@ class Rtttl : public Component {
/// The gain of the output. /// The gain of the output.
float gain_{0.6f}; float gain_{0.6f};
/// The current state of the RTTTL player. /// The current state of the RTTTL player.
State state_{State::STATE_STOPPED}; State state_{State::STOPPED};
#ifdef USE_OUTPUT #ifdef USE_OUTPUT
/// The output to write the sound to. /// The output to write the sound to.
output::FloatOutput *output_; output::FloatOutput *output_;
#endif #endif // USE_OUTPUT
#ifdef USE_SPEAKER #ifdef USE_SPEAKER
/// The speaker to write the sound to. /// The speaker to write the sound to.
@@ -110,8 +103,7 @@ class Rtttl : public Component {
int samples_count_{0}; int samples_count_{0};
/// The number of samples for the gap between notes. /// The number of samples for the gap between notes.
int samples_gap_{0}; int samples_gap_{0};
#endif // USE_SPEAKER
#endif
/// The callback to call when playback is finished. /// The callback to call when playback is finished.
CallbackManager<void()> on_finished_playback_callback_; CallbackManager<void()> on_finished_playback_callback_;
@@ -145,5 +137,4 @@ class FinishedPlaybackTrigger : public Trigger<> {
} }
}; };
} // namespace rtttl } // namespace esphome::rtttl
} // namespace esphome