Home-IoT/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-03-14 04:25:15 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

make use of the new speaker methods

Browse source
This commit is contained in:
NP v/d Spek 2024-10-21 17:57:34 +02:00
parent 8bbe4efded
commit 026efc2121
2 changed files with 18 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
esphome/components/rtttl/rtttl.cpp
View file

@ -16,7 +16,7 @@ static const uint16_t NOTES[] = {0, 262, 277, 294, 311, 330, 349, 370,
1109, 1175, 1245, 1319, 1397, 1480, 1568, 1661, 1760, 1865, 1976, 2093, 2217,
2349, 2489, 2637, 2794, 2960, 3136, 3322, 3520, 3729, 3951};
static const uint16_t I2S_SPEED = 1000;
static const uint16_t SAMPLE_RATE = 1600;
#undef HALF_PI
static const double HALF_PI = 1.5707963267948966192313216916398;
@ -148,6 +148,13 @@ void Rtttl::loop() {
}
} else if (this->state_ == State::STATE_INIT) {
if (this->speaker_->is_stopped()) {
audio::AudioStreamInfo audio_stream_info;
audio_stream_info.channels = 1;
audio_stream_info.bits_per_sample = 16;
audio_stream_info.sample_rate = SAMPLE_RATE;
this->speaker_->set_audio_stream_info(audio_stream_info);
this->speaker_->set_volume(this->gain_);
this->speaker_->start();
this->set_state_(State::STATE_STARTING);
}
@ -160,7 +167,7 @@ void Rtttl::loop() {
return;
}
if (this->samples_sent_ != this->samples_count_) {
SpeakerSample sample[SAMPLE_BUFFER_SIZE + 2];
uint8_t sample[SAMPLE_BUFFER_SIZE + 2];
int x = 0;
double rem = 0.0;
@ -170,14 +177,12 @@ void Rtttl::loop() {
if (this->samples_per_wave_ != 0 && this->samples_sent_ >= this->samples_gap_) { // Play note//
rem = ((this->samples_sent_ << 10) % this->samples_per_wave_) * (360.0 / this->samples_per_wave_);
int16_t val = (127 * this->gain_) * sin(deg2rad(rem)); // 16bit = 49152
int16_t val = 127 * sin(deg2rad(rem)); // 16bit = 49152
sample[x].left = val;
sample[x].right = val;
sample[x] = val;
} else {
sample[x].left = 0;
sample[x].right = 0;
sample[x] = 0;
}
if (x >= SAMPLE_BUFFER_SIZE || this->samples_sent_ >= this->samples_count_) {
@ -187,9 +192,9 @@ void Rtttl::loop() {
x++;
}
if (x > 0) {
int send = this->speaker_->play((uint8_t *) (&sample), x * 2);
if (send != x * 4) {
this->samples_sent_ -= (x - (send / 2));
int send = this->speaker_->play((uint8_t *) (&sample), x);
if (send != x) {
this->samples_sent_ -= (x - send);
}
return;
}
@ -315,9 +320,9 @@ void Rtttl::loop() {
this->samples_sent_ = 0;
this->samples_gap_ = 0;
this->samples_per_wave_ = 0;
this->samples_count_ = (this->sample_rate_ * this->note_duration_) / 1600; //(ms);
this->samples_count_ = (this->sample_rate_ * this->note_duration_) / SAMPLE_RATE; //(ms);
if (need_note_gap) {
this->samples_gap_ = (this->sample_rate_ * DOUBLE_NOTE_GAP_MS) / 1600; //(ms);
this->samples_gap_ = (this->sample_rate_ * DOUBLE_NOTE_GAP_MS) / SAMPLE_RATE; //(ms);
}
if (this->output_freq_ != 0) {
// make sure there is enough samples to add a full last sinus.
@ -348,13 +353,6 @@ void Rtttl::finish_() {
#endif
#ifdef USE_SPEAKER
if (this->speaker_ != nullptr) {
SpeakerSample sample[2];
sample[0].left = 0;
sample[0].right = 0;
sample[1].left = 0;
sample[1].right = 0;
this->speaker_->play((uint8_t *) (&sample), 8);
this->speaker_->finish();
this->set_state_(State::STATE_STOPPING);
}

7
esphome/components/rtttl/rtttl.h
View file

@ -23,12 +23,7 @@ enum State : uint8_t {
};
#ifdef USE_SPEAKER
static const size_t SAMPLE_BUFFER_SIZE = 2048;
struct SpeakerSample {
int8_t left{0};
int8_t right{0};
};
static const size_t SAMPLE_BUFFER_SIZE = 4096;
#endif
class Rtttl : public Component {