feat(esp-box): Update implementation

components/esp-box/include/esp-box.hpp

@@ -70,16 +70,16 @@ class EspBox : public BaseComponent {
   /// Get the type of the box
   /// \return The type of the box that was detected
   /// \see BoxType
-  BoxType box_type() const;
+  BoxType box_type() const { return box_type_; }
 
   /// Get a reference to the internal I2C bus
   /// \return A reference to the internal I2C bus
   /// \note The internal I2C bus is used for the touchscreen and audio codec
-  I2c &internal_i2c();
+  I2c &internal_i2c() { return internal_i2c_; }
 
   /// Get a reference to the interrupts
   /// \return A reference to the interrupts
-  espp::Interrupt &interrupts();
+  espp::Interrupt &interrupts() { return interrupts_; }
 
   /////////////////////////////////////////////////////////////////////////////
   // Touchpad
@@ -98,11 +98,11 @@ class EspBox : public BaseComponent {
 
   /// Get the touchpad input
   /// \return A shared pointer to the touchpad input
-  std::shared_ptr<TouchpadInput> touchpad_input() const;
+  std::shared_ptr<TouchpadInput> touchpad_input() const { return touchpad_input_; }
 
   /// Get the most recent touchpad data
   /// \return The touchpad data
-  TouchpadData touchpad_data() const;
+  TouchpadData touchpad_data() const { return touchpad_data_; }
 
   /// Get the most recent touchpad data
   /// \param num_touch_points The number of touch points
@@ -157,7 +157,7 @@ class EspBox : public BaseComponent {
 
   /// Get a shared pointer to the display
   /// \return A shared pointer to the display
-  std::shared_ptr<Display<Pixel>> display() const;
+  std::shared_ptr<Display<Pixel>> display() const { return display_; }
 
   /// Set the brightness of the backlight
   /// \param brightness The brightness of the backlight as a percentage (0 - 100)
@@ -234,9 +234,16 @@ class EspBox : public BaseComponent {
 
   /// Initialize the sound subsystem
   /// \param default_audio_rate The default audio rate
+  /// \param task_config The task configuration for the audio task
   /// \return true if the sound subsystem was successfully initialized, false
   ///         otherwise
-  bool initialize_sound(uint32_t default_audio_rate = 48000);
+  bool initialize_sound(uint32_t default_audio_rate = 48000,
+                        const espp::Task::BaseConfig &task_config = {
+                            .name = "audio",
+                            .stack_size_bytes = 4096,
+                            .priority = 19,
+                            .core_id = 1,
+                        });
 
   /// Enable or disable sound
   /// \note This method sets the power pin to the appropriate value
@@ -393,6 +400,7 @@ class EspBox : public BaseComponent {
             }
           },
       .active_level = touch_interrupt_level,
+      .filter_type = espp::Interrupt::FilterType::PIN_GLITCH_FILTER,
   };
 
   // we'll only add each interrupt pin if the initialize method is called

components/esp-box/src/audio.cpp

@@ -0,0 +1,205 @@
+#include "esp-box.hpp"
+
+using namespace espp;
+
+////////////////////////
+// Audio Functions   //
+////////////////////////
+
+static TaskHandle_t play_audio_task_handle_ = NULL;
+
+static bool audio_tx_sent_callback(i2s_chan_handle_t handle, i2s_event_data_t *event,
+                                   void *user_ctx) {
+  // notify the main task that we're done
+  vTaskNotifyGiveFromISR(play_audio_task_handle_, NULL);
+  return true;
+}
+
+bool EspBox::initialize_codec() {
+  logger_.info("initializing codec");
+
+  set_es8311_write(std::bind(&espp::I2c::write, &internal_i2c_, std::placeholders::_1,
+                             std::placeholders::_2, std::placeholders::_3));
+  set_es8311_read(std::bind(&espp::I2c::read_at_register, &internal_i2c_, std::placeholders::_1,
+                            std::placeholders::_2, std::placeholders::_3, std::placeholders::_4));
+
+  esp_err_t ret_val = ESP_OK;
+  audio_hal_codec_config_t cfg;
+  memset(&cfg, 0, sizeof(cfg));
+  cfg.codec_mode = AUDIO_HAL_CODEC_MODE_DECODE;
+  cfg.dac_output = AUDIO_HAL_DAC_OUTPUT_LINE1;
+  cfg.i2s_iface.bits = AUDIO_HAL_BIT_LENGTH_16BITS;
+  cfg.i2s_iface.fmt = AUDIO_HAL_I2S_NORMAL;
+  cfg.i2s_iface.mode = AUDIO_HAL_MODE_SLAVE;
+  cfg.i2s_iface.samples = AUDIO_HAL_16K_SAMPLES;
+
+  ret_val |= es8311_codec_init(&cfg);
+  ret_val |= es8311_set_bits_per_sample(cfg.i2s_iface.bits);
+  ret_val |= es8311_config_fmt((es_i2s_fmt_t)cfg.i2s_iface.fmt);
+  ret_val |= es8311_codec_set_voice_volume(volume_);
+  ret_val |= es8311_codec_ctrl_state(cfg.codec_mode, AUDIO_HAL_CTRL_START);
+
+  if (ESP_OK != ret_val) {
+    logger_.error("Codec initialization failed");
+    return false;
+  } else {
+    logger_.info("Codec initialized");
+    return true;
+  }
+}
+
+bool EspBox::initialize_i2s(uint32_t default_audio_rate) {
+  logger_.info("initializing i2s driver");
+  logger_.debug("Using newer I2S standard");
+  i2s_chan_config_t chan_cfg = {
+      .id = i2s_port,
+      .role = I2S_ROLE_MASTER,
+      .dma_desc_num = 16,  // TODO: calculate form audio rate
+      .dma_frame_num = 48, // TODO: calculate from audio rate
+      .auto_clear = true,
+      .intr_priority = 0,
+  };
+
+  ESP_ERROR_CHECK(i2s_new_channel(&chan_cfg, &audio_tx_handle, nullptr));
+
+  audio_std_cfg = {
+      .clk_cfg =
+          {
+              .sample_rate_hz = default_audio_rate,
+              .clk_src = I2S_CLK_SRC_DEFAULT,
+              .ext_clk_freq_hz = 0,
+              .mclk_multiple = I2S_MCLK_MULTIPLE_256,
+          },
+      .slot_cfg =
+          I2S_STD_PHILIPS_SLOT_DEFAULT_CONFIG(I2S_DATA_BIT_WIDTH_16BIT, I2S_SLOT_MODE_STEREO),
+      .gpio_cfg =
+          {
+              .mclk = i2s_mck_io,
+              .bclk = i2s_bck_io,
+              .ws = i2s_ws_io,
+              .dout = i2s_do_io,
+              .din = i2s_di_io,
+              .invert_flags =
+                  {
+                      .mclk_inv = false,
+                      .bclk_inv = false,
+                      .ws_inv = false,
+                  },
+          },
+  };
+  audio_std_cfg.clk_cfg.mclk_multiple = I2S_MCLK_MULTIPLE_256;
+
+  ESP_ERROR_CHECK(i2s_channel_init_std_mode(audio_tx_handle, &audio_std_cfg));
+
+  auto buffer_size = calc_audio_buffer_size(default_audio_rate);
+  audio_tx_buffer.resize(buffer_size);
+
+  audio_tx_stream = xStreamBufferCreate(buffer_size * 4, 0);
+
+  play_audio_task_handle_ = xTaskGetCurrentTaskHandle();
+
+  memset(&audio_tx_callbacks_, 0, sizeof(audio_tx_callbacks_));
+  audio_tx_callbacks_.on_sent = audio_tx_sent_callback;
+  i2s_channel_register_event_callback(audio_tx_handle, &audio_tx_callbacks_, NULL);
+
+  xStreamBufferReset(audio_tx_stream);
+
+  ESP_ERROR_CHECK(i2s_channel_enable(audio_tx_handle));
+
+  return true;
+}
+
+bool EspBox::initialize_sound(uint32_t default_audio_rate,
+                              const espp::Task::BaseConfig &task_config) {
+
+  if (!initialize_i2s(default_audio_rate)) {
+    logger_.error("Could not initialize I2S driver");
+    return false;
+  }
+  if (!initialize_codec()) {
+    logger_.error("Could not initialize codec");
+    return false;
+  }
+
+  // Config power control IO
+  gpio_set_direction(sound_power_pin, GPIO_MODE_OUTPUT);
+  enable_sound(true);
+
+  using namespace std::placeholders;
+  audio_task_ = espp::Task::make_unique({
+      .callback = std::bind(&EspBox::audio_task_callback, this, _1, _2, _3),
+      .task_config = task_config,
+  });
+
+  return audio_task_->start();
+}
+
+void EspBox::enable_sound(bool enable) { gpio_set_level(sound_power_pin, enable); }
+
+bool EspBox::audio_task_callback(std::mutex &m, std::condition_variable &cv, bool &task_notified) {
+  // Queue the next I2S out frame to write
+  uint16_t available = xStreamBufferBytesAvailable(audio_tx_stream);
+  int buffer_size = audio_tx_buffer.size();
+  available = std::min<uint16_t>(available, buffer_size);
+  uint8_t *buffer = &audio_tx_buffer[0];
+  memset(buffer, 0, buffer_size);
+
+  if (available == 0) {
+    i2s_channel_write(audio_tx_handle, buffer, buffer_size, NULL, portMAX_DELAY);
+  } else {
+    xStreamBufferReceive(audio_tx_stream, buffer, available, 0);
+    i2s_channel_write(audio_tx_handle, buffer, available, NULL, portMAX_DELAY);
+  }
+  return false; // don't stop the task
+}
+
+void EspBox::update_volume_output() {
+  if (mute_) {
+    es8311_codec_set_voice_volume(0);
+  } else {
+    es8311_codec_set_voice_volume(volume_);
+  }
+}
+
+void EspBox::mute(bool mute) {
+  mute_ = mute;
+  update_volume_output();
+}
+
+bool EspBox::is_muted() const { return mute_; }
+
+void EspBox::volume(float volume) {
+  volume_ = volume;
+  update_volume_output();
+}
+
+float EspBox::volume() const { return volume_; }
+
+uint32_t EspBox::audio_sample_rate() const { return audio_std_cfg.clk_cfg.sample_rate_hz; }
+
+size_t EspBox::audio_buffer_size() const { return audio_tx_buffer.size(); }
+
+void EspBox::audio_sample_rate(uint32_t sample_rate) {
+  logger_.info("Setting audio sample rate to {} Hz", sample_rate);
+  // stop the channel
+  i2s_channel_disable(audio_tx_handle);
+  // update the sample rate
+  audio_std_cfg.clk_cfg.sample_rate_hz = sample_rate;
+  i2s_channel_reconfig_std_clock(audio_tx_handle, &audio_std_cfg.clk_cfg);
+  // clear the buffer
+  xStreamBufferReset(audio_tx_stream);
+  // restart the channel
+  i2s_channel_enable(audio_tx_handle);
+}
+
+void EspBox::play_audio(const std::vector<uint8_t> &data) { play_audio(data.data(), data.size()); }
+
+void EspBox::play_audio(const uint8_t *data, uint32_t num_bytes) {
+  play_audio_task_handle_ = xTaskGetCurrentTaskHandle();
+  if (has_sound) {
+    ulTaskNotifyTake(pdTRUE, portMAX_DELAY);
+  }
+  // don't block here
+  xStreamBufferSendFromISR(audio_tx_stream, data, num_bytes, NULL);
+  has_sound = true;
+}