Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions esphome/components/i2s_audio/i2s_audio.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -66,13 +66,18 @@ bool I2SAudioComponent::install_i2s_driver_(i2s_driver_config_t i2s_cfg, uint8_t
this->lock();
esph_log_d(TAG, "Install driver requested by %s", access == I2SAccess::RX ? "Reader" : "Writer");
if( this->access_state_ == I2SAccess::FREE || this->access_state_ == access ){
if( this->driver_loaded_ ){
ESP_LOGW(TAG,"trying to load i2s driver twice");
return true;
}
if(this->access_mode_ == I2SAccessMode::DUPLEX){
i2s_cfg.mode = (i2s_mode_t) (i2s_cfg.mode | I2S_MODE_TX | I2S_MODE_RX);
}
success = ESP_OK == i2s_driver_install(this->get_port(), &i2s_cfg, 0, nullptr);
esph_log_d(TAG, "Installing driver : %s", success ? "yes" : "no" );
i2s_pin_config_t pin_config = this->get_pin_config();
if( success ){
this->driver_loaded_ = true;
if( this->audio_in_ != nullptr )
{
pin_config.data_in_num = this->audio_in_->get_din_pin();
Expand Down Expand Up @@ -107,6 +112,7 @@ bool I2SAudioComponent::uninstall_i2s_driver_(uint8_t access){
if (err == ESP_OK) {
success = true;
this->access_state_ = I2SAccess::FREE;
this->driver_loaded_ = false;
} else {
esph_log_e(TAG, "Couldn't unload driver");
}
Expand Down
1 change: 1 addition & 0 deletions esphome/components/i2s_audio/i2s_audio.h
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ class I2SAudioComponent : public Component {
int lrclk_pin_;
i2s_port_t port_{};
i2s_driver_config_t installed_cfg_{};
bool driver_loaded_{false};
};

class ExternalADC;
Expand Down
14 changes: 6 additions & 8 deletions esphome/components/satellite1/media_player/nabu_media_player.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -142,13 +142,11 @@ esp_err_t NabuMediaPlayer::start_i2s_driver_() {
if (!this->claim_i2s_access()) {
return ESP_ERR_INVALID_STATE; // Waiting for another i2s component to return lock
}


i2s_driver_config_t config = this->get_i2s_cfg();
if (!this->install_i2s_driver(config)) {
return ESP_ERR_INVALID_STATE;
}

return ESP_OK;
}

Expand Down Expand Up @@ -239,23 +237,23 @@ void NabuMediaPlayer::speaker_task(void *params) {
}

} else {
i2s_zero_dma_buffer(this_speaker->parent_->get_port());
//i2s_zero_dma_buffer(this_speaker->parent_->get_port());

event.type = EventType::IDLE;
xQueueSend(this_speaker->speaker_event_queue_, &event, 0);
}
}

i2s_zero_dma_buffer(this_speaker->parent_->get_port());
//i2s_zero_dma_buffer(this_speaker->parent_->get_port());

event.type = EventType::STOPPING;
xQueueSend(this_speaker->speaker_event_queue_, &event, portMAX_DELAY);

allocator.deallocate(buffer, SAMPLES_IN_ALL_DMA_BUFFERS);
i2s_stop(this_speaker->parent_->get_port());
i2s_driver_uninstall(this_speaker->parent_->get_port());

this_speaker->parent_->unlock();
//i2s_stop(this_speaker->parent_->get_port());
//i2s_driver_uninstall(this_speaker->parent_->get_port());
this_speaker->uninstall_i2s_driver();
//this_speaker->parent_->unlock();

event.type = EventType::STOPPED;
xQueueSend(this_speaker->speaker_event_queue_, &event, portMAX_DELAY);
Expand Down