Merge branch 'dev' into nvds-new-espnow

CODEOWNERS

@@ -48,7 +48,9 @@ esphome/components/at581x/* @X-Ryl669
 esphome/components/atc_mithermometer/* @ahpohl
 esphome/components/atm90e26/* @danieltwagner
 esphome/components/atm90e32/* @circuitsetup @descipher
+esphome/components/audio/* @kahrendt
 esphome/components/audio_dac/* @kbx81
+esphome/components/axs15231/* @clydebarrow
 esphome/components/b_parasite/* @rbaron
 esphome/components/ballu/* @bazuchan
 esphome/components/bang_bang/* @OttoWinter

esphome/components/audio/__init__.py

@@ -0,0 +1,9 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+
+CODEOWNERS = ["@kahrendt"]
+audio_ns = cg.esphome_ns.namespace("audio")
+
+CONFIG_SCHEMA = cv.All(
+    cv.Schema({}),
+)

esphome/components/audio/audio.h

@@ -0,0 +1,21 @@
+#pragma once
+
+#include <cstdint>
+#include <stddef.h>
+
+namespace esphome {
+namespace audio {
+
+struct AudioStreamInfo {
+  bool operator==(const AudioStreamInfo &rhs) const {
+    return (channels == rhs.channels) && (bits_per_sample == rhs.bits_per_sample) && (sample_rate == rhs.sample_rate);
+  }
+  bool operator!=(const AudioStreamInfo &rhs) const { return !operator==(rhs); }
+  size_t get_bytes_per_sample() const { return bits_per_sample / 8; }
+  uint8_t channels = 1;
+  uint8_t bits_per_sample = 16;
+  uint32_t sample_rate = 16000;
+};
+
+}  // namespace audio
+}  // namespace esphome

esphome/components/axs15231/__init__.py

@@ -0,0 +1,6 @@
+import esphome.codegen as cg
+
+CODEOWNERS = ["@clydebarrow"]
+DEPENDENCIES = ["i2c"]
+
+axs15231_ns = cg.esphome_ns.namespace("axs15231")

esphome/components/axs15231/touchscreen/__init__.py

@@ -0,0 +1,36 @@
+from esphome import pins
+import esphome.codegen as cg
+from esphome.components import i2c, touchscreen
+import esphome.config_validation as cv
+from esphome.const import CONF_ID, CONF_INTERRUPT_PIN, CONF_RESET_PIN
+
+from .. import axs15231_ns
+
+AXS15231Touchscreen = axs15231_ns.class_(
+    "AXS15231Touchscreen",
+    touchscreen.Touchscreen,
+    i2c.I2CDevice,
+)
+
+CONFIG_SCHEMA = (
+    touchscreen.touchscreen_schema("50ms")
+    .extend(
+        {
+            cv.GenerateID(): cv.declare_id(AXS15231Touchscreen),
+            cv.Optional(CONF_INTERRUPT_PIN): pins.internal_gpio_input_pin_schema,
+            cv.Optional(CONF_RESET_PIN): pins.gpio_output_pin_schema,
+        }
+    )
+    .extend(i2c.i2c_device_schema(0x3B))
+)
+
+
+async def to_code(config):
+    var = cg.new_Pvariable(config[CONF_ID])
+    await touchscreen.register_touchscreen(var, config)
+    await i2c.register_i2c_device(var, config)
+
+    if interrupt_pin := config.get(CONF_INTERRUPT_PIN):
+        cg.add(var.set_interrupt_pin(await cg.gpio_pin_expression(interrupt_pin)))
+    if reset_pin := config.get(CONF_RESET_PIN):
+        cg.add(var.set_reset_pin(await cg.gpio_pin_expression(reset_pin)))

esphome/components/axs15231/touchscreen/axs15231_touchscreen.cpp

@@ -0,0 +1,64 @@
+#include "axs15231_touchscreen.h"
+
+#include "esphome/core/helpers.h"
+#include "esphome/core/log.h"
+
+namespace esphome {
+namespace axs15231 {
+
+static const char *const TAG = "ax15231.touchscreen";
+
+constexpr static const uint8_t AXS_READ_TOUCHPAD[11] = {0xb5, 0xab, 0xa5, 0x5a, 0x0, 0x0, 0x0, 0x8};
+
+#define ERROR_CHECK(err) \
+  if ((err) != i2c::ERROR_OK) { \
+    this->status_set_warning("Failed to communicate"); \
+    return; \
+  }
+
+void AXS15231Touchscreen::setup() {
+  ESP_LOGCONFIG(TAG, "Setting up AXS15231 Touchscreen...");
+  if (this->reset_pin_ != nullptr) {
+    this->reset_pin_->setup();
+    this->reset_pin_->digital_write(false);
+    delay(5);
+    this->reset_pin_->digital_write(true);
+    delay(10);
+  }
+  if (this->interrupt_pin_ != nullptr) {
+    this->interrupt_pin_->pin_mode(gpio::FLAG_INPUT);
+    this->interrupt_pin_->setup();
+    this->attach_interrupt_(this->interrupt_pin_, gpio::INTERRUPT_FALLING_EDGE);
+  }
+  this->x_raw_max_ = this->display_->get_native_width();
+  this->y_raw_max_ = this->display_->get_native_height();
+  ESP_LOGCONFIG(TAG, "AXS15231 Touchscreen setup complete");
+}
+
+void AXS15231Touchscreen::update_touches() {
+  i2c::ErrorCode err;
+  uint8_t data[8]{};
+
+  err = this->write(AXS_READ_TOUCHPAD, sizeof(AXS_READ_TOUCHPAD), false);
+  ERROR_CHECK(err);
+  err = this->read(data, sizeof(data));
+  ERROR_CHECK(err);
+  this->status_clear_warning();
+  if (data[0] != 0)  // no touches
+    return;
+  uint16_t x = encode_uint16(data[2] & 0xF, data[3]);
+  uint16_t y = encode_uint16(data[4] & 0xF, data[5]);
+  this->add_raw_touch_position_(0, x, y);
+}
+
+void AXS15231Touchscreen::dump_config() {
+  ESP_LOGCONFIG(TAG, "AXS15231 Touchscreen:");
+  LOG_I2C_DEVICE(this);
+  LOG_PIN("  Interrupt Pin: ", this->interrupt_pin_);
+  LOG_PIN("  Reset Pin: ", this->reset_pin_);
+  ESP_LOGCONFIG(TAG, "  Width: %d", this->x_raw_max_);
+  ESP_LOGCONFIG(TAG, "  Height: %d", this->y_raw_max_);
+}
+
+}  // namespace axs15231
+}  // namespace esphome

esphome/components/axs15231/touchscreen/axs15231_touchscreen.h

@@ -0,0 +1,27 @@
+#pragma once
+
+#include "esphome/components/i2c/i2c.h"
+#include "esphome/components/touchscreen/touchscreen.h"
+#include "esphome/core/component.h"
+#include "esphome/core/hal.h"
+
+namespace esphome {
+namespace axs15231 {
+
+class AXS15231Touchscreen : public touchscreen::Touchscreen, public i2c::I2CDevice {
+ public:
+  void setup() override;
+  void dump_config() override;
+
+  void set_interrupt_pin(InternalGPIOPin *pin) { this->interrupt_pin_ = pin; }
+  void set_reset_pin(GPIOPin *pin) { this->reset_pin_ = pin; }
+
+ protected:
+  void update_touches() override;
+
+  InternalGPIOPin *interrupt_pin_{};
+  GPIOPin *reset_pin_{};
+};
+
+}  // namespace axs15231
+}  // namespace esphome

esphome/components/esp32_ble/const_esp32c6.h

@@ -40,6 +40,9 @@ static const esp_bt_controller_config_t BT_CONTROLLER_CONFIG = {
     .controller_run_cpu = 0,
     .enable_qa_test = RUN_QA_TEST,
     .enable_bqb_test = RUN_BQB_TEST,
+#if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 3, 1)
+    // The following fields have been removed since ESP IDF version 5.3.1, see commit:
+    // https://github.com/espressif/esp-idf/commit/e761c1de8f9c0777829d597b4d5a33bb070a30a8
     .enable_uart_hci = HCI_UART_EN,
     .ble_hci_uart_port = DEFAULT_BT_LE_HCI_UART_PORT,
     .ble_hci_uart_baud = DEFAULT_BT_LE_HCI_UART_BAUD,
@@ -47,6 +50,7 @@ static const esp_bt_controller_config_t BT_CONTROLLER_CONFIG = {
     .ble_hci_uart_stop_bits = DEFAULT_BT_LE_HCI_UART_STOP_BITS,
     .ble_hci_uart_flow_ctrl = DEFAULT_BT_LE_HCI_UART_FLOW_CTRL,
     .ble_hci_uart_uart_parity = DEFAULT_BT_LE_HCI_UART_PARITY,
+#endif
     .enable_tx_cca = DEFAULT_BT_LE_TX_CCA_ENABLED,
     .cca_rssi_thresh = 256 - DEFAULT_BT_LE_CCA_RSSI_THRESH,
     .sleep_en = NIMBLE_SLEEP_ENABLE,
@@ -58,6 +62,9 @@ static const esp_bt_controller_config_t BT_CONTROLLER_CONFIG = {
     .cpu_freq_mhz = CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ,
     .ignore_wl_for_direct_adv = 0,
     .enable_pcl = DEFAULT_BT_LE_POWER_CONTROL_ENABLED,
+#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 1, 3)
+    .csa2_select = DEFAULT_BT_LE_50_FEATURE_SUPPORT,
+#endif
     .config_magic = CONFIG_MAGIC,
 };
 

esphome/components/i2s_audio/speaker/__init__.py

@@ -16,6 +16,7 @@ from .. import (
     register_i2s_audio_component,
 )
 
+AUTO_LOAD = ["audio"]
 CODEOWNERS = ["@jesserockz"]
 DEPENDENCIES = ["i2s_audio"]
 
@@ -72,7 +73,7 @@ BASE_SCHEMA = (
     .extend(
         {
             cv.Optional(
-                CONF_TIMEOUT, default="100ms"
+                CONF_TIMEOUT, default="500ms"
             ): cv.positive_time_period_milliseconds,
         }
     )

esphome/components/i2s_audio/speaker/i2s_audio_speaker.cpp

@@ -4,6 +4,8 @@
 
 #include <driver/i2s.h>
 
+#include "esphome/components/audio/audio.h"
+
 #include "esphome/core/application.h"
 #include "esphome/core/hal.h"
 #include "esphome/core/log.h"
@@ -11,186 +13,296 @@
 namespace esphome {
 namespace i2s_audio {
 
-static const size_t BUFFER_COUNT = 20;
+static const size_t DMA_BUFFER_SIZE = 512;
+static const size_t DMA_BUFFERS_COUNT = 4;
+static const size_t FRAMES_IN_ALL_DMA_BUFFERS = DMA_BUFFER_SIZE * DMA_BUFFERS_COUNT;
+static const size_t RING_BUFFER_SAMPLES = 8192;
+static const size_t TASK_DELAY_MS = 10;
+static const size_t TASK_STACK_SIZE = 4096;
+static const ssize_t TASK_PRIORITY = 23;
 
 static const char *const TAG = "i2s_audio.speaker";
 
+enum SpeakerEventGroupBits : uint32_t {
+  COMMAND_START = (1 << 0),                           // Starts the main task purpose
+  COMMAND_STOP = (1 << 1),                            // stops the main task
+  COMMAND_STOP_GRACEFULLY = (1 << 2),                 // Stops the task once all data has been written
+  MESSAGE_RING_BUFFER_AVAILABLE_TO_WRITE = (1 << 5),  // Locks the ring buffer when not set
+  STATE_STARTING = (1 << 10),
+  STATE_RUNNING = (1 << 11),
+  STATE_STOPPING = (1 << 12),
+  STATE_STOPPED = (1 << 13),
+  ERR_TASK_FAILED_TO_START = (1 << 15),
+  ERR_ESP_INVALID_STATE = (1 << 16),
+  ERR_ESP_INVALID_ARG = (1 << 17),
+  ERR_ESP_INVALID_SIZE = (1 << 18),
+  ERR_ESP_NO_MEM = (1 << 19),
+  ERR_ESP_FAIL = (1 << 20),
+  ALL_ERR_ESP_BITS = ERR_ESP_INVALID_STATE | ERR_ESP_INVALID_ARG | ERR_ESP_INVALID_SIZE | ERR_ESP_NO_MEM | ERR_ESP_FAIL,
+  ALL_BITS = 0x00FFFFFF,  // All valid FreeRTOS event group bits
+};
+
+// Translates a SpeakerEventGroupBits ERR_ESP bit to the coressponding esp_err_t
+static esp_err_t err_bit_to_esp_err(uint32_t bit) {
+  switch (bit) {
+    case SpeakerEventGroupBits::ERR_ESP_INVALID_STATE:
+      return ESP_ERR_INVALID_STATE;
+    case SpeakerEventGroupBits::ERR_ESP_INVALID_ARG:
+      return ESP_ERR_INVALID_ARG;
+    case SpeakerEventGroupBits::ERR_ESP_INVALID_SIZE:
+      return ESP_ERR_INVALID_SIZE;
+    case SpeakerEventGroupBits::ERR_ESP_NO_MEM:
+      return ESP_ERR_NO_MEM;
+    default:
+      return ESP_FAIL;
+  }
+}
+
+/// @brief Multiplies the input array of Q15 numbers by a Q15 constant factor
+///
+/// Based on `dsps_mulc_s16_ansi` from the esp-dsp library:
+/// https://github.com/espressif/esp-dsp/blob/master/modules/math/mulc/fixed/dsps_mulc_s16_ansi.c
+/// (accessed on 2024-09-30).
+/// @param input Array of Q15 numbers
+/// @param output Array of Q15 numbers
+/// @param len Length of array
+/// @param c Q15 constant factor
+static void q15_multiplication(const int16_t *input, int16_t *output, size_t len, int16_t c) {
+  for (int i = 0; i < len; i++) {
+    int32_t acc = (int32_t) input[i] * (int32_t) c;
+    output[i] = (int16_t) (acc >> 15);
+  }
+}
+
+// Lists the Q15 fixed point scaling factor for volume reduction.
+// Has 100 values representing silence and a reduction [49, 48.5, ... 0.5, 0] dB.
+// dB to PCM scaling factor formula: floating_point_scale_factor = 2^(-db/6.014)
+// float to Q15 fixed point formula: q15_scale_factor = floating_point_scale_factor * 2^(15)
+static const std::vector<int16_t> Q15_VOLUME_SCALING_FACTORS = {
+    0,     116,   122,   130,   137,   146,   154,   163,   173,   183,   194,   206,   218,   231,   244,
+    259,   274,   291,   308,   326,   345,   366,   388,   411,   435,   461,   488,   517,   548,   580,
+    615,   651,   690,   731,   774,   820,   868,   920,   974,   1032,  1094,  1158,  1227,  1300,  1377,
+    1459,  1545,  1637,  1734,  1837,  1946,  2061,  2184,  2313,  2450,  2596,  2750,  2913,  3085,  3269,
+    3462,  3668,  3885,  4116,  4360,  4619,  4893,  5183,  5490,  5816,  6161,  6527,  6914,  7324,  7758,
+    8218,  8706,  9222,  9770,  10349, 10963, 11613, 12302, 13032, 13805, 14624, 15491, 16410, 17384, 18415,
+    19508, 20665, 21891, 23189, 24565, 26022, 27566, 29201, 30933, 32767};
+
 void I2SAudioSpeaker::setup() {
   ESP_LOGCONFIG(TAG, "Setting up I2S Audio Speaker...");
 
-  this->buffer_queue_ = xQueueCreate(BUFFER_COUNT, sizeof(DataEvent));
+  if (this->event_group_ == nullptr) {
-  if (this->buffer_queue_ == nullptr) {
+    this->event_group_ = xEventGroupCreate();
-    ESP_LOGE(TAG, "Failed to create buffer queue");
-    this->mark_failed();
-    return;
   }
 
-  this->event_queue_ = xQueueCreate(BUFFER_COUNT, sizeof(TaskEvent));
+  if (this->event_group_ == nullptr) {
-  if (this->event_queue_ == nullptr) {
+    ESP_LOGE(TAG, "Failed to create event group");
-    ESP_LOGE(TAG, "Failed to create event queue");
     this->mark_failed();
     return;
   }
 }
 
-void I2SAudioSpeaker::start() {
+void I2SAudioSpeaker::loop() {
-  if (this->is_failed()) {
+  uint32_t event_group_bits = xEventGroupGetBits(this->event_group_);
-    ESP_LOGE(TAG, "Cannot start audio, speaker failed to setup");
+
-    return;
+  if (event_group_bits & SpeakerEventGroupBits::ERR_TASK_FAILED_TO_START) {
+    this->status_set_error("Failed to start speaker task");
   }
-  if (this->task_created_) {
+
-    ESP_LOGW(TAG, "Called start while task has been already created.");
+  if (event_group_bits & SpeakerEventGroupBits::ALL_ERR_ESP_BITS) {
-    return;
+    uint32_t error_bits = event_group_bits & SpeakerEventGroupBits::ALL_ERR_ESP_BITS;
+    ESP_LOGW(TAG, "Error writing to I2S: %s", esp_err_to_name(err_bit_to_esp_err(error_bits)));
+    this->status_set_warning();
   }
+
+  if (event_group_bits & SpeakerEventGroupBits::STATE_STARTING) {
+    ESP_LOGD(TAG, "Starting Speaker");
     this->state_ = speaker::STATE_STARTING;
+    xEventGroupClearBits(this->event_group_, SpeakerEventGroupBits::STATE_STARTING);
+  }
+  if (event_group_bits & SpeakerEventGroupBits::STATE_RUNNING) {
+    ESP_LOGD(TAG, "Started Speaker");
+    this->state_ = speaker::STATE_RUNNING;
+    xEventGroupClearBits(this->event_group_, SpeakerEventGroupBits::STATE_RUNNING);
+    this->status_clear_warning();
+    this->status_clear_error();
+  }
+  if (event_group_bits & SpeakerEventGroupBits::STATE_STOPPING) {
+    ESP_LOGD(TAG, "Stopping Speaker");
+    this->state_ = speaker::STATE_STOPPING;
+    xEventGroupClearBits(this->event_group_, SpeakerEventGroupBits::STATE_STOPPING);
+  }
+  if (event_group_bits & SpeakerEventGroupBits::STATE_STOPPED) {
+    if (!this->task_created_) {
+      ESP_LOGD(TAG, "Stopped Speaker");
+      this->state_ = speaker::STATE_STOPPED;
+      xEventGroupClearBits(this->event_group_, SpeakerEventGroupBits::ALL_BITS);
+      this->speaker_task_handle_ = nullptr;
     }
-void I2SAudioSpeaker::start_() {
-  if (this->task_created_) {
-    return;
   }
-  if (!this->parent_->try_lock()) {
-    return;  // Waiting for another i2s component to return lock
 }
 
-  xTaskCreate(I2SAudioSpeaker::player_task, "speaker_task", 8192, (void *) this, 1, &this->player_task_handle_);
+void I2SAudioSpeaker::set_volume(float volume) {
-  this->task_created_ = true;
+  this->volume_ = volume;
+  ssize_t decibel_index = remap<ssize_t, float>(volume, 0.0f, 1.0f, 0, Q15_VOLUME_SCALING_FACTORS.size() - 1);
+  this->q15_volume_factor_ = Q15_VOLUME_SCALING_FACTORS[decibel_index];
 }
 
-template<typename a, typename b> const uint8_t *convert_data_format(const a *from, b *to, size_t &bytes, bool repeat) {
+size_t I2SAudioSpeaker::play(const uint8_t *data, size_t length, TickType_t ticks_to_wait) {
-  if (sizeof(a) == sizeof(b) && !repeat) {
+  if (this->is_failed()) {
-    return reinterpret_cast<const uint8_t *>(from);
+    ESP_LOGE(TAG, "Cannot play audio, speaker failed to setup");
+    return 0;
   }
-  const b *result = to;
+  if (this->state_ != speaker::STATE_RUNNING && this->state_ != speaker::STATE_STARTING) {
-  for (size_t i = 0; i < bytes; i += sizeof(a)) {
+    this->start();
-    b value = static_cast<b>(*from++) << (sizeof(b) - sizeof(a)) * 8;
-    *to++ = value;
-    if (repeat)
-      *to++ = value;
-  }
-  bytes *= (sizeof(b) / sizeof(a)) * (repeat ? 2 : 1);  // NOLINT
-  return reinterpret_cast<const uint8_t *>(result);
   }
 
-void I2SAudioSpeaker::player_task(void *params) {
+  // Wait for the ring buffer to be available
+  uint32_t event_bits =
+      xEventGroupWaitBits(this->event_group_, SpeakerEventGroupBits::MESSAGE_RING_BUFFER_AVAILABLE_TO_WRITE, pdFALSE,
+                          pdFALSE, pdMS_TO_TICKS(TASK_DELAY_MS));
+
+  if (event_bits & SpeakerEventGroupBits::MESSAGE_RING_BUFFER_AVAILABLE_TO_WRITE) {
+    // Ring buffer is available to write
+
+    // Lock the ring buffer, write to it, then unlock it
+    xEventGroupClearBits(this->event_group_, SpeakerEventGroupBits::MESSAGE_RING_BUFFER_AVAILABLE_TO_WRITE);
+    size_t bytes_written = this->audio_ring_buffer_->write_without_replacement((void *) data, length, ticks_to_wait);
+    xEventGroupSetBits(this->event_group_, SpeakerEventGroupBits::MESSAGE_RING_BUFFER_AVAILABLE_TO_WRITE);
+
+    return bytes_written;
+  }
+
+  return 0;
+}
+
+bool I2SAudioSpeaker::has_buffered_data() const {
+  if (this->audio_ring_buffer_ != nullptr) {
+    return this->audio_ring_buffer_->available() > 0;
+  }
+  return false;
+}
+
+void I2SAudioSpeaker::speaker_task(void *params) {
   I2SAudioSpeaker *this_speaker = (I2SAudioSpeaker *) params;
+  uint32_t event_group_bits =
+      xEventGroupWaitBits(this_speaker->event_group_,
+                          SpeakerEventGroupBits::COMMAND_START | SpeakerEventGroupBits::COMMAND_STOP |
+                              SpeakerEventGroupBits::COMMAND_STOP_GRACEFULLY,  // Bit message to read
+                          pdTRUE,                                              // Clear the bits on exit
+                          pdFALSE,                                             // Don't wait for all the bits,
+                          portMAX_DELAY);                                      // Block indefinitely until a bit is set
 
-  TaskEvent event;
+  if (event_group_bits & (SpeakerEventGroupBits::COMMAND_STOP | SpeakerEventGroupBits::COMMAND_STOP_GRACEFULLY)) {
-  event.type = TaskEventType::STARTING;
+    // Received a stop signal before the task was requested to start
-  xQueueSend(this_speaker->event_queue_, &event, portMAX_DELAY);
+    this_speaker->delete_task_(0);
-
-  i2s_driver_config_t config = {
-      .mode = (i2s_mode_t) (this_speaker->i2s_mode_ | I2S_MODE_TX),
-      .sample_rate = this_speaker->sample_rate_,
-      .bits_per_sample = this_speaker->bits_per_sample_,
-      .channel_format = this_speaker->channel_,
-      .communication_format = this_speaker->i2s_comm_fmt_,
-      .intr_alloc_flags = ESP_INTR_FLAG_LEVEL1,
-      .dma_buf_count = 8,
-      .dma_buf_len = 256,
-      .use_apll = this_speaker->use_apll_,
-      .tx_desc_auto_clear = true,
-      .fixed_mclk = 0,
-      .mclk_multiple = I2S_MCLK_MULTIPLE_256,
-      .bits_per_chan = this_speaker->bits_per_channel_,
-  };
-#if SOC_I2S_SUPPORTS_DAC
-  if (this_speaker->internal_dac_mode_ != I2S_DAC_CHANNEL_DISABLE) {
-    config.mode = (i2s_mode_t) (config.mode | I2S_MODE_DAC_BUILT_IN);
-  }
-#endif
-
-  esp_err_t err = i2s_driver_install(this_speaker->parent_->get_port(), &config, 0, nullptr);
-  if (err != ESP_OK) {
-    event.type = TaskEventType::WARNING;
-    event.err = err;
-    xQueueSend(this_speaker->event_queue_, &event, 0);
-    event.type = TaskEventType::STOPPED;
-    xQueueSend(this_speaker->event_queue_, &event, 0);
-    while (true) {
-      delay(10);
-    }
   }
 
-#if SOC_I2S_SUPPORTS_DAC
+  xEventGroupSetBits(this_speaker->event_group_, SpeakerEventGroupBits::STATE_STARTING);
-  if (this_speaker->internal_dac_mode_ == I2S_DAC_CHANNEL_DISABLE) {
-#endif
-    i2s_pin_config_t pin_config = this_speaker->parent_->get_pin_config();
-    pin_config.data_out_num = this_speaker->dout_pin_;
 
-    i2s_set_pin(this_speaker->parent_->get_port(), &pin_config);
+  audio::AudioStreamInfo audio_stream_info = this_speaker->audio_stream_info_;
-#if SOC_I2S_SUPPORTS_DAC
+  const ssize_t bytes_per_sample = audio_stream_info.get_bytes_per_sample();
+  const uint8_t number_of_channels = audio_stream_info.channels;
+
+  const size_t dma_buffers_size = FRAMES_IN_ALL_DMA_BUFFERS * bytes_per_sample * number_of_channels;
+
+  if (this_speaker->send_esp_err_to_event_group_(
+          this_speaker->allocate_buffers_(dma_buffers_size, RING_BUFFER_SAMPLES * bytes_per_sample))) {
+    // Failed to allocate buffers
+    xEventGroupSetBits(this_speaker->event_group_, SpeakerEventGroupBits::ERR_ESP_NO_MEM);
+    this_speaker->delete_task_(dma_buffers_size);
+  }
+
+  if (this_speaker->send_esp_err_to_event_group_(this_speaker->start_i2s_driver_())) {
+    // Failed to start I2S driver
+    this_speaker->delete_task_(dma_buffers_size);
   } else {
-    i2s_set_dac_mode(this_speaker->internal_dac_mode_);
+    // Ring buffer is allocated, so indicate its can be written to
+    xEventGroupSetBits(this_speaker->event_group_, SpeakerEventGroupBits::MESSAGE_RING_BUFFER_AVAILABLE_TO_WRITE);
   }
-#endif
 
-  DataEvent data_event;
+  if (!this_speaker->send_esp_err_to_event_group_(this_speaker->reconfigure_i2s_stream_info_(audio_stream_info))) {
+    // Successfully set the I2S stream info, ready to write audio data to the I2S port
 
-  event.type = TaskEventType::STARTED;
+    xEventGroupSetBits(this_speaker->event_group_, SpeakerEventGroupBits::STATE_RUNNING);
-  xQueueSend(this_speaker->event_queue_, &event, portMAX_DELAY);
 
-  int32_t buffer[BUFFER_SIZE];
+    bool stop_gracefully = false;
+    uint32_t last_data_received_time = millis();
 
-  while (true) {
+    while ((millis() - last_data_received_time) <= this_speaker->timeout_) {
-    if (xQueueReceive(this_speaker->buffer_queue_, &data_event, this_speaker->timeout_ / portTICK_PERIOD_MS) !=
+      event_group_bits = xEventGroupGetBits(this_speaker->event_group_);
-        pdTRUE) {
+
-      break;  // End of audio from main thread
+      if (event_group_bits & SpeakerEventGroupBits::COMMAND_STOP) {
-    }
-    if (data_event.stop) {
-      // Stop signal from main thread
-      xQueueReset(this_speaker->buffer_queue_);  // Flush queue
         break;
       }
+      if (event_group_bits & SpeakerEventGroupBits::COMMAND_STOP_GRACEFULLY) {
+        stop_gracefully = true;
+      }
 
-    const uint8_t *data = data_event.data;
+      size_t bytes_to_read = dma_buffers_size;
-    size_t remaining = data_event.len;
+      size_t bytes_read = this_speaker->audio_ring_buffer_->read((void *) this_speaker->data_buffer_, bytes_to_read,
-    switch (this_speaker->bits_per_sample_) {
+                                                                 pdMS_TO_TICKS(TASK_DELAY_MS));
-      case I2S_BITS_PER_SAMPLE_8BIT:
+
-      case I2S_BITS_PER_SAMPLE_16BIT: {
+      if (bytes_read > 0) {
-        data = convert_data_format(reinterpret_cast<const int16_t *>(data), reinterpret_cast<int16_t *>(buffer),
+        last_data_received_time = millis();
-                                   remaining, this_speaker->channel_ == I2S_CHANNEL_FMT_ALL_LEFT);
+        size_t bytes_written = 0;
+
+        if ((audio_stream_info.bits_per_sample == 16) && (this_speaker->q15_volume_factor_ < INT16_MAX)) {
+          // Scale samples by the volume factor in place
+          q15_multiplication((int16_t *) this_speaker->data_buffer_, (int16_t *) this_speaker->data_buffer_,
+                             bytes_read / sizeof(int16_t), this_speaker->q15_volume_factor_);
+        }
+
+        if (audio_stream_info.bits_per_sample == (uint8_t) this_speaker->bits_per_sample_) {
+          i2s_write(this_speaker->parent_->get_port(), this_speaker->data_buffer_, bytes_read, &bytes_written,
+                    portMAX_DELAY);
+        } else if (audio_stream_info.bits_per_sample < (uint8_t) this_speaker->bits_per_sample_) {
+          i2s_write_expand(this_speaker->parent_->get_port(), this_speaker->data_buffer_, bytes_read,
+                           audio_stream_info.bits_per_sample, this_speaker->bits_per_sample_, &bytes_written,
+                           portMAX_DELAY);
+        }
+
+        if (bytes_written != bytes_read) {
+          xEventGroupSetBits(this_speaker->event_group_, SpeakerEventGroupBits::ERR_ESP_INVALID_SIZE);
+        }
+
+      } else {
+        // No data received
+
+        if (stop_gracefully) {
           break;
         }
-      case I2S_BITS_PER_SAMPLE_24BIT:
-      case I2S_BITS_PER_SAMPLE_32BIT: {
-        data = convert_data_format(reinterpret_cast<const int16_t *>(data), reinterpret_cast<int32_t *>(buffer),
-                                   remaining, this_speaker->channel_ == I2S_CHANNEL_FMT_ALL_LEFT);
-        break;
-      }
-    }
-
-    while (remaining != 0) {
-      size_t bytes_written;
-      esp_err_t err =
-          i2s_write(this_speaker->parent_->get_port(), data, remaining, &bytes_written, (32 / portTICK_PERIOD_MS));
-      if (err != ESP_OK) {
-        event = {.type = TaskEventType::WARNING, .err = err};
-        if (xQueueSend(this_speaker->event_queue_, &event, 10 / portTICK_PERIOD_MS) != pdTRUE) {
-          ESP_LOGW(TAG, "Failed to send WARNING event");
-        }
-        continue;
-      }
-      data += bytes_written;
-      remaining -= bytes_written;
-    }
-  }
-
-  event.type = TaskEventType::STOPPING;
-  if (xQueueSend(this_speaker->event_queue_, &event, 10 / portTICK_PERIOD_MS) != pdTRUE) {
-    ESP_LOGW(TAG, "Failed to send STOPPING event");
-  }
 
         i2s_zero_dma_buffer(this_speaker->parent_->get_port());
+      }
+    }
+  }
+  i2s_zero_dma_buffer(this_speaker->parent_->get_port());
 
+  xEventGroupSetBits(this_speaker->event_group_, SpeakerEventGroupBits::STATE_STOPPING);
+
+  i2s_stop(this_speaker->parent_->get_port());
   i2s_driver_uninstall(this_speaker->parent_->get_port());
 
-  event.type = TaskEventType::STOPPED;
+  this_speaker->parent_->unlock();
-  if (xQueueSend(this_speaker->event_queue_, &event, 10 / portTICK_PERIOD_MS) != pdTRUE) {
+  this_speaker->delete_task_(dma_buffers_size);
-    ESP_LOGW(TAG, "Failed to send STOPPED event");
 }
 
-  while (true) {
+void I2SAudioSpeaker::start() {
-    delay(10);
+  if (this->is_failed())
+    return;
+  if ((this->state_ == speaker::STATE_STARTING) || (this->state_ == speaker::STATE_RUNNING))
+    return;
+
+  if (this->speaker_task_handle_ == nullptr) {
+    xTaskCreate(I2SAudioSpeaker::speaker_task, "speaker_task", TASK_STACK_SIZE, (void *) this, TASK_PRIORITY,
+                &this->speaker_task_handle_);
+  }
+
+  if (this->speaker_task_handle_ != nullptr) {
+    xEventGroupSetBits(this->event_group_, SpeakerEventGroupBits::COMMAND_START);
+    this->task_created_ = true;
+  } else {
+    xEventGroupSetBits(this->event_group_, SpeakerEventGroupBits::ERR_TASK_FAILED_TO_START);
   }
 }
 
@@ -203,92 +315,169 @@ void I2SAudioSpeaker::stop_(bool wait_on_empty) {
     return;
   if (this->state_ == speaker::STATE_STOPPED)
     return;
-  if (this->state_ == speaker::STATE_STARTING) {
+
-    this->state_ = speaker::STATE_STOPPED;
-    return;
-  }
-  this->state_ = speaker::STATE_STOPPING;
-  DataEvent data;
-  data.stop = true;
   if (wait_on_empty) {
-    xQueueSend(this->buffer_queue_, &data, portMAX_DELAY);
+    xEventGroupSetBits(this->event_group_, SpeakerEventGroupBits::COMMAND_STOP_GRACEFULLY);
   } else {
-    xQueueSendToFront(this->buffer_queue_, &data, portMAX_DELAY);
+    xEventGroupSetBits(this->event_group_, SpeakerEventGroupBits::COMMAND_STOP);
   }
 }
 
-void I2SAudioSpeaker::watch_() {
+bool I2SAudioSpeaker::send_esp_err_to_event_group_(esp_err_t err) {
-  TaskEvent event;
+  switch (err) {
-  if (xQueueReceive(this->event_queue_, &event, 0) == pdTRUE) {
+    case ESP_OK:
-    switch (event.type) {
+      return false;
-      case TaskEventType::STARTING:
+    case ESP_ERR_INVALID_STATE:
-        ESP_LOGD(TAG, "Starting I2S Audio Speaker");
+      xEventGroupSetBits(this->event_group_, SpeakerEventGroupBits::ERR_ESP_INVALID_STATE);
-        break;
+      return true;
-      case TaskEventType::STARTED:
+    case ESP_ERR_INVALID_ARG:
-        ESP_LOGD(TAG, "Started I2S Audio Speaker");
+      xEventGroupSetBits(this->event_group_, SpeakerEventGroupBits::ERR_ESP_INVALID_ARG);
-        this->state_ = speaker::STATE_RUNNING;
+      return true;
-        this->status_clear_warning();
+    case ESP_ERR_INVALID_SIZE:
-        break;
+      xEventGroupSetBits(this->event_group_, SpeakerEventGroupBits::ERR_ESP_INVALID_SIZE);
-      case TaskEventType::STOPPING:
+      return true;
-        ESP_LOGD(TAG, "Stopping I2S Audio Speaker");
+    case ESP_ERR_NO_MEM:
-        break;
+      xEventGroupSetBits(this->event_group_, SpeakerEventGroupBits::ERR_ESP_NO_MEM);
-      case TaskEventType::STOPPED:
+      return true;
-        this->state_ = speaker::STATE_STOPPED;
+    default:
-        vTaskDelete(this->player_task_handle_);
+      xEventGroupSetBits(this->event_group_, SpeakerEventGroupBits::ERR_ESP_FAIL);
-        this->task_created_ = false;
+      return true;
-        this->player_task_handle_ = nullptr;
+  }
+}
+
+esp_err_t I2SAudioSpeaker::allocate_buffers_(size_t data_buffer_size, size_t ring_buffer_size) {
+  if (this->data_buffer_ == nullptr) {
+    // Allocate data buffer for temporarily storing audio from the ring buffer before writing to the I2S bus
+    ExternalRAMAllocator<uint8_t> allocator(ExternalRAMAllocator<uint8_t>::ALLOW_FAILURE);
+    this->data_buffer_ = allocator.allocate(data_buffer_size);
+  }
+
+  if (this->data_buffer_ == nullptr) {
+    return ESP_ERR_NO_MEM;
+  }
+
+  if (this->audio_ring_buffer_ == nullptr) {
+    // Allocate ring buffer
+    this->audio_ring_buffer_ = RingBuffer::create(ring_buffer_size);
+  }
+
+  if (this->audio_ring_buffer_ == nullptr) {
+    return ESP_ERR_NO_MEM;
+  }
+
+  return ESP_OK;
+}
+
+esp_err_t I2SAudioSpeaker::start_i2s_driver_() {
+  if (!this->parent_->try_lock()) {
+    return ESP_ERR_INVALID_STATE;
+  }
+
+  i2s_driver_config_t config = {
+    .mode = (i2s_mode_t) (this->i2s_mode_ | I2S_MODE_TX),
+    .sample_rate = this->sample_rate_,
+    .bits_per_sample = this->bits_per_sample_,
+    .channel_format = this->channel_,
+    .communication_format = this->i2s_comm_fmt_,
+    .intr_alloc_flags = ESP_INTR_FLAG_LEVEL1,
+    .dma_buf_count = DMA_BUFFERS_COUNT,
+    .dma_buf_len = DMA_BUFFER_SIZE,
+    .use_apll = this->use_apll_,
+    .tx_desc_auto_clear = true,
+    .fixed_mclk = I2S_PIN_NO_CHANGE,
+    .mclk_multiple = I2S_MCLK_MULTIPLE_256,
+    .bits_per_chan = this->bits_per_channel_,
+#if SOC_I2S_SUPPORTS_TDM
+    .chan_mask = (i2s_channel_t) (I2S_TDM_ACTIVE_CH0 | I2S_TDM_ACTIVE_CH1),
+    .total_chan = 2,
+    .left_align = false,
+    .big_edin = false,
+    .bit_order_msb = false,
+    .skip_msk = false,
+#endif
+  };
+#if SOC_I2S_SUPPORTS_DAC
+  if (this->internal_dac_mode_ != I2S_DAC_CHANNEL_DISABLE) {
+    config.mode = (i2s_mode_t) (config.mode | I2S_MODE_DAC_BUILT_IN);
+  }
+#endif
+
+  esp_err_t err = i2s_driver_install(this->parent_->get_port(), &config, 0, nullptr);
+  if (err != ESP_OK) {
+    // Failed to install the driver, so unlock the I2S port
     this->parent_->unlock();
-        xQueueReset(this->buffer_queue_);
+    return err;
-        ESP_LOGD(TAG, "Stopped I2S Audio Speaker");
-        break;
-      case TaskEventType::WARNING:
-        ESP_LOGW(TAG, "Error writing to I2S: %s", esp_err_to_name(event.err));
-        this->status_set_warning();
-        break;
-    }
-  }
   }
 
-void I2SAudioSpeaker::loop() {
+#if SOC_I2S_SUPPORTS_DAC
-  switch (this->state_) {
+  if (this->internal_dac_mode_ == I2S_DAC_CHANNEL_DISABLE) {
-    case speaker::STATE_STARTING:
+#endif
-      this->start_();
+    i2s_pin_config_t pin_config = this->parent_->get_pin_config();
-      [[fallthrough]];
+    pin_config.data_out_num = this->dout_pin_;
-    case speaker::STATE_RUNNING:
+
-    case speaker::STATE_STOPPING:
+    err = i2s_set_pin(this->parent_->get_port(), &pin_config);
-      this->watch_();
+#if SOC_I2S_SUPPORTS_DAC
-      break;
+  } else {
-    case speaker::STATE_STOPPED:
+    i2s_set_dac_mode(this->internal_dac_mode_);
-      break;
   }
+#endif
+
+  if (err != ESP_OK) {
+    // Failed to set the data out pin, so uninstall the driver and unlock the I2S port
+    i2s_driver_uninstall(this->parent_->get_port());
+    this->parent_->unlock();
   }
 
-size_t I2SAudioSpeaker::play(const uint8_t *data, size_t length) {
+  return err;
-  if (this->is_failed()) {
-    ESP_LOGE(TAG, "Cannot play audio, speaker failed to setup");
-    return 0;
-  }
-  if (this->state_ != speaker::STATE_RUNNING && this->state_ != speaker::STATE_STARTING) {
-    this->start();
-  }
-  size_t remaining = length;
-  size_t index = 0;
-  while (remaining > 0) {
-    DataEvent event;
-    event.stop = false;
-    size_t to_send_length = std::min(remaining, BUFFER_SIZE);
-    event.len = to_send_length;
-    memcpy(event.data, data + index, to_send_length);
-    if (xQueueSend(this->buffer_queue_, &event, 0) != pdTRUE) {
-      return index;
-    }
-    remaining -= to_send_length;
-    index += to_send_length;
-  }
-  return index;
 }
 
-bool I2SAudioSpeaker::has_buffered_data() const { return uxQueueMessagesWaiting(this->buffer_queue_) > 0; }
+esp_err_t I2SAudioSpeaker::reconfigure_i2s_stream_info_(audio::AudioStreamInfo &audio_stream_info) {
+  if (this->i2s_mode_ & I2S_MODE_MASTER) {
+    // ESP controls for the the I2S bus, so adjust the sample rate and bits per sample to match the incoming audio
+    this->sample_rate_ = audio_stream_info.sample_rate;
+    this->bits_per_sample_ = (i2s_bits_per_sample_t) audio_stream_info.bits_per_sample;
+  } else if (this->sample_rate_ != audio_stream_info.sample_rate) {
+    // Can't reconfigure I2S bus, so the sample rate must match the configured value
+    return ESP_ERR_INVALID_ARG;
+  }
+
+  if ((i2s_bits_per_sample_t) audio_stream_info.bits_per_sample > this->bits_per_sample_) {
+    // Currently can't handle the case when the incoming audio has more bits per sample than the configured value
+    return ESP_ERR_INVALID_ARG;
+  }
+
+  if (audio_stream_info.channels == 1) {
+    return i2s_set_clk(this->parent_->get_port(), this->sample_rate_, this->bits_per_sample_, I2S_CHANNEL_MONO);
+  } else if (audio_stream_info.channels == 2) {
+    return i2s_set_clk(this->parent_->get_port(), this->sample_rate_, this->bits_per_sample_, I2S_CHANNEL_STEREO);
+  }
+
+  return ESP_ERR_INVALID_ARG;
+}
+
+void I2SAudioSpeaker::delete_task_(size_t buffer_size) {
+  if (this->audio_ring_buffer_ != nullptr) {
+    xEventGroupWaitBits(this->event_group_,
+                        MESSAGE_RING_BUFFER_AVAILABLE_TO_WRITE,  // Bit message to read
+                        pdFALSE,                                 // Don't clear the bits on exit
+                        pdTRUE,                                  // Don't wait for all the bits,
+                        portMAX_DELAY);                          // Block indefinitely until a command bit is set
+
+    this->audio_ring_buffer_.reset();  // Deallocates the ring buffer stored in the unique_ptr
+    this->audio_ring_buffer_ = nullptr;
+  }
+
+  if (this->data_buffer_ != nullptr) {
+    ExternalRAMAllocator<uint8_t> allocator(ExternalRAMAllocator<uint8_t>::ALLOW_FAILURE);
+    allocator.deallocate(this->data_buffer_, buffer_size);
+    this->data_buffer_ = nullptr;
+  }
+
+  xEventGroupSetBits(this->event_group_, SpeakerEventGroupBits::STATE_STOPPED);
+
+  this->task_created_ = false;
+  vTaskDelete(nullptr);
+}
 
 }  // namespace i2s_audio
 }  // namespace esphome

esphome/components/i2s_audio/speaker/i2s_audio_speaker.h

@@ -5,38 +5,21 @@
 #include "../i2s_audio.h"
 
 #include <driver/i2s.h>
-#include <freertos/FreeRTOS.h>
-#include <freertos/queue.h>
 
+#include <freertos/event_groups.h>
+#include <freertos/FreeRTOS.h>
+
+#include "esphome/components/audio/audio.h"
 #include "esphome/components/speaker/speaker.h"
+
 #include "esphome/core/component.h"
 #include "esphome/core/gpio.h"
 #include "esphome/core/helpers.h"
+#include "esphome/core/ring_buffer.h"
 
 namespace esphome {
 namespace i2s_audio {
 
-static const size_t BUFFER_SIZE = 1024;
-
-enum class TaskEventType : uint8_t {
-  STARTING = 0,
-  STARTED,
-  STOPPING,
-  STOPPED,
-  WARNING = 255,
-};
-
-struct TaskEvent {
-  TaskEventType type;
-  esp_err_t err;
-};
-
-struct DataEvent {
-  bool stop;
-  size_t len;
-  uint8_t data[BUFFER_SIZE];
-};
-
 class I2SAudioSpeaker : public I2SAudioOut, public speaker::Speaker, public Component {
  public:
   float get_setup_priority() const override { return esphome::setup_priority::LATE; }
@@ -55,25 +38,89 @@ class I2SAudioSpeaker : public I2SAudioOut, public speaker::Speaker, public Comp
   void stop() override;
   void finish() override;
 
-  size_t play(const uint8_t *data, size_t length) override;
+  /// @brief Plays the provided audio data.
+  /// Starts the speaker task, if necessary. Writes the audio data to the ring buffer.
+  /// @param data Audio data in the format set by the parent speaker classes ``set_audio_stream_info`` method.
+  /// @param length The length of the audio data in bytes.
+  /// @param ticks_to_wait The FreeRTOS ticks to wait before writing as much data as possible to the ring buffer.
+  /// @return The number of bytes that were actually written to the ring buffer.
+  size_t play(const uint8_t *data, size_t length, TickType_t ticks_to_wait) override;
+  size_t play(const uint8_t *data, size_t length) override { return play(data, length, 0); }
 
   bool has_buffered_data() const override;
 
+  /// @brief Sets the volume of the speaker. It is implemented as a software volume control.
+  /// Overrides the default setter to convert the floating point volume to a Q15 fixed-point factor.
+  /// @param volume
+  void set_volume(float volume) override;
+  float get_volume() override { return this->volume_; }
+
  protected:
-  void start_();
+  /// @brief Function for the FreeRTOS task handling audio output.
+  /// After receiving the COMMAND_START signal, allocates space for the buffers, starts the I2S driver, and reads
+  /// audio from the ring buffer and writes audio to the I2S port. Stops immmiately after receiving the COMMAND_STOP
+  /// signal and stops only after the ring buffer is empty after receiving the COMMAND_STOP_GRACEFULLY signal. Stops if
+  /// the ring buffer hasn't read data for more than timeout_ milliseconds. When stopping, it deallocates the buffers,
+  /// stops the I2S driver, unlocks the I2S port, and deletes the task. It communicates the state and any errors via
+  /// event_group_.
+  /// @param params I2SAudioSpeaker component
+  static void speaker_task(void *params);
+
+  /// @brief Sends a stop command to the speaker task via event_group_.
+  /// @param wait_on_empty If false, sends the COMMAND_STOP signal. If true, sends the COMMAND_STOP_GRACEFULLY signal.
   void stop_(bool wait_on_empty);
-  void watch_();
 
-  static void player_task(void *params);
+  /// @brief Sets the corresponding ERR_ESP event group bits.
+  /// @param err esp_err_t error code.
+  /// @return True if an ERR_ESP bit is set and false if err == ESP_OK
+  bool send_esp_err_to_event_group_(esp_err_t err);
 
-  TaskHandle_t player_task_handle_{nullptr};
+  /// @brief Allocates the data buffer and ring buffer
-  QueueHandle_t buffer_queue_;
+  /// @param data_buffer_size Number of bytes to allocate for the data buffer.
-  QueueHandle_t event_queue_;
+  /// @param ring_buffer_size Number of bytes to allocate for the ring buffer.
+  /// @return ESP_ERR_NO_MEM if either buffer fails to allocate
+  ///         ESP_OK if successful
+  esp_err_t allocate_buffers_(size_t data_buffer_size, size_t ring_buffer_size);
+
+  /// @brief Starts the ESP32 I2S driver.
+  /// Attempts to lock the I2S port, starts the I2S driver, and sets the data out pin. If it fails, it will unlock
+  /// the I2S port and uninstall the driver, if necessary.
+  /// @return ESP_ERR_INVALID_STATE if the I2S port is already locked.
+  ///         ESP_ERR_INVALID_ARG if installing the driver or setting the data out pin fails due to a parameter error.
+  ///         ESP_ERR_NO_MEM if the driver fails to install due to a memory allocation error.
+  ///         ESP_FAIL if setting the data out pin fails due to an IO error
+  ///         ESP_OK if successful
+  esp_err_t start_i2s_driver_();
+
+  /// @brief Adjusts the I2S driver configuration to match the incoming audio stream.
+  /// Modifies I2S driver's sample rate, bits per sample, and number of channel settings. If the I2S is in secondary
+  /// mode, it only modifies the number of channels.
+  /// @param audio_stream_info  Describes the incoming audio stream
+  /// @return ESP_ERR_INVALID_ARG if there is a parameter error, if there is more than 2 channels in the stream, or if
+  ///           the audio settings are incompatible with the configuration.
+  ///         ESP_ERR_NO_MEM if the driver fails to reconfigure due to a memory allocation error.
+  ///         ESP_OK if successful.
+  esp_err_t reconfigure_i2s_stream_info_(audio::AudioStreamInfo &audio_stream_info);
+
+  /// @brief Deletes the speaker's task.
+  /// Deallocates the data_buffer_ and audio_ring_buffer_, if necessary, and deletes the task. Should only be called by
+  /// the speaker_task itself.
+  /// @param buffer_size The allocated size of the data_buffer_.
+  void delete_task_(size_t buffer_size);
+
+  TaskHandle_t speaker_task_handle_{nullptr};
+  EventGroupHandle_t event_group_{nullptr};
+
+  uint8_t *data_buffer_;
+  std::unique_ptr<RingBuffer> audio_ring_buffer_;
+
+  uint32_t timeout_;
+  uint8_t dout_pin_;
 
-  uint32_t timeout_{0};
-  uint8_t dout_pin_{0};
   bool task_created_{false};
 
+  int16_t q15_volume_factor_{INT16_MAX};
+
 #if SOC_I2S_SUPPORTS_DAC
   i2s_dac_mode_t internal_dac_mode_{I2S_DAC_CHANNEL_DISABLE};
 #endif

esphome/components/lvgl/__init__.py

@@ -22,7 +22,7 @@ from esphome.helpers import write_file_if_changed
 
 from . import defines as df, helpers, lv_validation as lvalid
 from .automation import disp_update, focused_widgets, update_to_code
-from .defines import CONF_WIDGETS, add_define
+from .defines import add_define
 from .encoders import ENCODERS_CONFIG, encoders_to_code, initial_focus_to_code
 from .gradient import GRADIENT_SCHEMA, gradients_to_code
 from .hello_world import get_hello_world
@@ -54,7 +54,7 @@ from .types import (
     lv_style_t,
     lvgl_ns,
 )
-from .widgets import Widget, add_widgets, lv_scr_act, set_obj_properties, styles_used
+from .widgets import Widget, add_widgets, get_scr_act, set_obj_properties, styles_used
 from .widgets.animimg import animimg_spec
 from .widgets.arc import arc_spec
 from .widgets.button import button_spec
@@ -186,7 +186,7 @@ def final_validation(config):
 
 async def to_code(config):
     cg.add_library("lvgl/lvgl", "8.4.0")
-    CORE.add_define("USE_LVGL")
+    cg.add_define("USE_LVGL")
     # suppress default enabling of extra widgets
     add_define("_LV_KCONFIG_PRESENT")
     # Always enable - lots of things use it.
@@ -200,7 +200,13 @@ async def to_code(config):
     add_define("LV_MEM_CUSTOM_REALLOC", "lv_custom_mem_realloc")
     add_define("LV_MEM_CUSTOM_INCLUDE", '"esphome/components/lvgl/lvgl_hal.h"')
 
-    add_define("LV_LOG_LEVEL", f"LV_LOG_LEVEL_{config[df.CONF_LOG_LEVEL]}")
+    add_define(
+        "LV_LOG_LEVEL", f"LV_LOG_LEVEL_{df.LV_LOG_LEVELS[config[df.CONF_LOG_LEVEL]]}"
+    )
+    cg.add_define(
+        "LVGL_LOG_LEVEL",
+        cg.RawExpression(f"ESPHOME_LOG_LEVEL_{config[df.CONF_LOG_LEVEL]}"),
+    )
     add_define("LV_COLOR_DEPTH", config[df.CONF_COLOR_DEPTH])
     for font in helpers.lv_fonts_used:
         add_define(f"LV_FONT_{font.upper()}")
@@ -214,15 +220,9 @@ async def to_code(config):
         "LV_COLOR_CHROMA_KEY",
         await lvalid.lv_color.process(config[df.CONF_TRANSPARENCY_KEY]),
     )
-    CORE.add_build_flag("-Isrc")
+    cg.add_build_flag("-Isrc")
 
     cg.add_global(lvgl_ns.using)
-    lv_component = cg.new_Pvariable(config[CONF_ID])
-    await cg.register_component(lv_component, config)
-    Widget.create(config[CONF_ID], lv_component, obj_spec, config)
-    for display in config[df.CONF_DISPLAYS]:
-        cg.add(lv_component.add_display(await cg.get_variable(display)))
-
     frac = config[CONF_BUFFER_SIZE]
     if frac >= 0.75:
         frac = 1
@@ -232,10 +232,17 @@ async def to_code(config):
         frac = 4
     else:
         frac = 8
-    cg.add(lv_component.set_buffer_frac(int(frac)))
+    displays = [await cg.get_variable(display) for display in config[df.CONF_DISPLAYS]]
-    cg.add(lv_component.set_full_refresh(config[df.CONF_FULL_REFRESH]))
+    lv_component = cg.new_Pvariable(
-    cg.add(lv_component.set_draw_rounding(config[df.CONF_DRAW_ROUNDING]))
+        config[CONF_ID],
-    cg.add(lv_component.set_resume_on_input(config[df.CONF_RESUME_ON_INPUT]))
+        displays,
+        frac,
+        config[df.CONF_FULL_REFRESH],
+        config[df.CONF_DRAW_ROUNDING],
+        config[df.CONF_RESUME_ON_INPUT],
+    )
+    await cg.register_component(lv_component, config)
+    Widget.create(config[CONF_ID], lv_component, obj_spec, config)
 
     for font in helpers.esphome_fonts_used:
         await cg.get_variable(font)
@@ -257,6 +264,7 @@ async def to_code(config):
     else:
         add_define("LV_FONT_DEFAULT", await lvalid.lv_font.process(default_font))
 
+    lv_scr_act = get_scr_act(lv_component)
     async with LvContext(lv_component):
         await touchscreens_to_code(lv_component, config)
         await encoders_to_code(lv_component, config)
@@ -266,12 +274,11 @@ async def to_code(config):
         await set_obj_properties(lv_scr_act, config)
         await add_widgets(lv_scr_act, config)
         await add_pages(lv_component, config)
-        await add_top_layer(config)
+        await add_top_layer(lv_component, config)
-        await msgboxes_to_code(config)
+        await msgboxes_to_code(lv_component, config)
-        await disp_update(f"{lv_component}->get_disp()", config)
+        await disp_update(lv_component.get_disp(), config)
-    # At this point only the setup code should be generated
+    # Set this directly since we are limited in how many methods can be added to the Widget class.
-    assert LvContext.added_lambda_count == 1
+    Widget.widgets_completed = True
-    Widget.set_completed()
     async with LvContext(lv_component):
         await generate_triggers(lv_component)
         await generate_page_triggers(lv_component, config)
@@ -290,15 +297,15 @@ async def to_code(config):
             await build_automation(resume_trigger, [], conf)
 
     for comp in helpers.lvgl_components_required:
-        CORE.add_define(f"USE_LVGL_{comp.upper()}")
+        cg.add_define(f"USE_LVGL_{comp.upper()}")
     if "transform_angle" in styles_used:
         add_define("LV_COLOR_SCREEN_TRANSP", "1")
     for use in helpers.lv_uses:
         add_define(f"LV_USE_{use.upper()}")
     lv_conf_h_file = CORE.relative_src_path(LV_CONF_FILENAME)
     write_file_if_changed(lv_conf_h_file, generate_lv_conf_h())
-    CORE.add_build_flag("-DLV_CONF_H=1")
+    cg.add_build_flag("-DLV_CONF_H=1")
-    CORE.add_build_flag(f'-DLV_CONF_PATH="{LV_CONF_FILENAME}"')
+    cg.add_build_flag(f'-DLV_CONF_PATH="{LV_CONF_FILENAME}"')
 
 
 def display_schema(config):
@@ -307,9 +314,9 @@ def display_schema(config):
 
 
 def add_hello_world(config):
-    if CONF_WIDGETS not in config and CONF_PAGES not in config:
+    if df.CONF_WIDGETS not in config and CONF_PAGES not in config:
         LOGGER.info("No pages or widgets configured, creating default hello_world page")
-        config[CONF_WIDGETS] = cv.ensure_list(WIDGET_SCHEMA)(get_hello_world())
+        config[df.CONF_WIDGETS] = cv.ensure_list(WIDGET_SCHEMA)(get_hello_world())
     return config
 
 
@@ -328,7 +335,7 @@ CONFIG_SCHEMA = (
             cv.Optional(df.CONF_DRAW_ROUNDING, default=2): cv.positive_int,
             cv.Optional(CONF_BUFFER_SIZE, default="100%"): cv.percentage,
             cv.Optional(df.CONF_LOG_LEVEL, default="WARN"): cv.one_of(
-                *df.LOG_LEVELS, upper=True
+                *df.LV_LOG_LEVELS, upper=True
             ),
             cv.Optional(df.CONF_BYTE_ORDER, default="big_endian"): cv.one_of(
                 "big_endian", "little_endian"

esphome/components/lvgl/automation.py

@@ -5,7 +5,7 @@ from esphome import automation
 import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.const import CONF_ACTION, CONF_GROUP, CONF_ID, CONF_TIMEOUT
-from esphome.cpp_generator import RawExpression, get_variable
+from esphome.cpp_generator import get_variable
 from esphome.cpp_types import nullptr
 
 from .defines import (
@@ -23,7 +23,6 @@ from .lvcode import (
     UPDATE_EVENT,
     LambdaContext,
     LocalVariable,
-    LvConditional,
     LvglComponent,
     ReturnStatement,
     add_line_marks,
@@ -47,8 +46,8 @@ from .types import (
 )
 from .widgets import (
     Widget,
+    get_scr_act,
     get_widgets,
-    lv_scr_act,
     set_obj_properties,
     wait_for_widgets,
 )
@@ -66,8 +65,6 @@ async def action_to_code(
 ):
     await wait_for_widgets()
     async with LambdaContext(parameters=args, where=action_id) as context:
-        with LvConditional(lv_expr.is_pre_initialise()):
-            context.add(RawExpression("return"))
         for widget in widgets:
             await action(widget)
     var = cg.new_Pvariable(action_id, template_arg, await context.get_lambda())
@@ -126,7 +123,7 @@ async def lvgl_is_idle(config, condition_id, template_arg, args):
 async def disp_update(disp, config: dict):
     if CONF_DISP_BG_COLOR not in config and CONF_DISP_BG_IMAGE not in config:
         return
-    with LocalVariable("lv_disp_tmp", lv_disp_t, literal(disp)) as disp_temp:
+    with LocalVariable("lv_disp_tmp", lv_disp_t, disp) as disp_temp:
         if (bg_color := config.get(CONF_DISP_BG_COLOR)) is not None:
             lv.disp_set_bg_color(disp_temp, await lv_color.process(bg_color))
         if bg_image := config.get(CONF_DISP_BG_IMAGE):
@@ -136,15 +133,24 @@ async def disp_update(disp, config: dict):
 @automation.register_action(
     "lvgl.widget.redraw",
     ObjUpdateAction,
+    cv.Any(
+        cv.maybe_simple_value(
+            {
+                cv.Required(CONF_ID): cv.use_id(lv_obj_t),
+                cv.GenerateID(CONF_LVGL_ID): cv.use_id(LvglComponent),
+            },
+            key=CONF_ID,
+        ),
         cv.Schema(
             {
-            cv.Optional(CONF_ID): cv.use_id(lv_obj_t),
                 cv.GenerateID(CONF_LVGL_ID): cv.use_id(LvglComponent),
             }
         ),
+    ),
 )
 async def obj_invalidate_to_code(config, action_id, template_arg, args):
-    widgets = await get_widgets(config) or [lv_scr_act]
+    lv_comp = await cg.get_variable(config[CONF_LVGL_ID])
+    widgets = await get_widgets(config) or [get_scr_act(lv_comp)]
 
     async def do_invalidate(widget: Widget):
         lv_obj.invalidate(widget.obj)
@@ -164,7 +170,7 @@ async def obj_invalidate_to_code(config, action_id, template_arg, args):
 async def lvgl_update_to_code(config, action_id, template_arg, args):
     widgets = await get_widgets(config)
     w = widgets[0]
-    disp = f"{w.obj}->get_disp()"
+    disp = literal(f"{w.obj}->get_disp()")
     async with LambdaContext(LVGL_COMP_ARG, where=action_id) as context:
         await disp_update(disp, config)
     var = cg.new_Pvariable(action_id, template_arg, await context.get_lambda())

esphome/components/lvgl/defines.py

@@ -189,14 +189,14 @@ LV_ANIM = LvConstant(
 LV_GRAD_DIR = LvConstant("LV_GRAD_DIR_", "NONE", "HOR", "VER")
 LV_DITHER = LvConstant("LV_DITHER_", "NONE", "ORDERED", "ERR_DIFF")
 
-LOG_LEVELS = (
+LV_LOG_LEVELS = {
-    "TRACE",
+    "VERBOSE": "TRACE",
-    "INFO",
+    "DEBUG": "TRACE",
-    "WARN",
+    "INFO": "INFO",
-    "ERROR",
+    "WARN": "WARN",
-    "USER",
+    "ERROR": "ERROR",
-    "NONE",
+    "NONE": "NONE",
-)
+}
 
 LV_LONG_MODES = LvConstant(
     "LV_LABEL_LONG_",
@@ -477,6 +477,7 @@ CONF_ROWS = "rows"
 CONF_SCALE_LINES = "scale_lines"
 CONF_SCROLLBAR_MODE = "scrollbar_mode"
 CONF_SELECTED_INDEX = "selected_index"
+CONF_SELECTED_TEXT = "selected_text"
 CONF_SHOW_SNOW = "show_snow"
 CONF_SPIN_TIME = "spin_time"
 CONF_SRC = "src"

esphome/components/lvgl/lvcode.py

@@ -183,17 +183,11 @@ class LvContext(LambdaContext):
         super().__init__(parameters=self.args)
         self.lv_component = lv_component
 
-    async def add_init_lambda(self):
-        if self.code_list:
-            cg.add(self.lv_component.add_init_lambda(await self.get_lambda()))
-            LvContext.added_lambda_count += 1
-
     async def __aexit__(self, exc_type, exc_val, exc_tb):
         await super().__aexit__(exc_type, exc_val, exc_tb)
-        await self.add_init_lambda()
 
     def add(self, expression: Union[Expression, Statement]):
-        self.code_list.append(self.indented_statement(expression))
+        cg.add(expression)
         return expression
 
     def __call__(self, *args):

esphome/components/lvgl/lvgl_esphome.cpp

@@ -5,16 +5,12 @@
 #include "lvgl_hal.h"
 #include "lvgl_esphome.h"
 
+#include <numeric>
+
 namespace esphome {
 namespace lvgl {
 static const char *const TAG = "lvgl";
 
-#if LV_USE_LOG
-static void log_cb(const char *buf) {
-  esp_log_printf_(ESPHOME_LOG_LEVEL_INFO, TAG, 0, "%.*s", (int) strlen(buf) - 1, buf);
-}
-#endif  // LV_USE_LOG
-
 static const char *const EVENT_NAMES[] = {
     "NONE",
     "PRESSED",
@@ -263,6 +259,39 @@ LVEncoderListener::LVEncoderListener(lv_indev_type_t type, uint16_t lpt, uint16_
 }
 #endif  // USE_LVGL_KEY_LISTENER
 
+#if defined(USE_LVGL_DROPDOWN) || defined(LV_USE_ROLLER)
+std::string LvSelectable::get_selected_text() {
+  auto selected = this->get_selected_index();
+  if (selected >= this->options_.size())
+    return "";
+  return this->options_[selected];
+}
+
+static std::string join_string(std::vector<std::string> options) {
+  return std::accumulate(
+      options.begin(), options.end(), std::string(),
+      [](const std::string &a, const std::string &b) -> std::string { return a + (a.length() > 0 ? "\n" : "") + b; });
+}
+
+void LvSelectable::set_selected_text(const std::string &text, lv_anim_enable_t anim) {
+  auto index = std::find(this->options_.begin(), this->options_.end(), text);
+  if (index != this->options_.end()) {
+    this->set_selected_index(index - this->options_.begin(), anim);
+    lv_event_send(this->obj, lv_api_event, nullptr);
+  }
+}
+
+void LvSelectable::set_options(std::vector<std::string> options) {
+  auto index = this->get_selected_index();
+  if (index >= options.size())
+    index = options.size() - 1;
+  this->options_ = std::move(options);
+  this->set_option_string(join_string(this->options_).c_str());
+  lv_event_send(this->obj, LV_EVENT_REFRESH, nullptr);
+  this->set_selected_index(index, LV_ANIM_OFF);
+}
+#endif  // USE_LVGL_DROPDOWN || LV_USE_ROLLER
+
 #ifdef USE_LVGL_BUTTONMATRIX
 void LvButtonMatrixType::set_obj(lv_obj_t *lv_obj) {
   LvCompound::set_obj(lv_obj);
@@ -348,26 +377,48 @@ void LvglComponent::write_random_() {
   }
 }
 
-void LvglComponent::setup() {
+/**
-  ESP_LOGCONFIG(TAG, "LVGL Setup starts");
+ * @class LvglComponent
-#if LV_USE_LOG
+ * @brief Component for rendering LVGL.
-  lv_log_register_print_cb(log_cb);
+ *
-#endif
+ * This component renders LVGL widgets on a display. Some initialisation must be done in the constructor
+ * since LVGL needs to be initialised before any widgets can be created.
+ *
+ * @param displays a list of displays to render onto. All displays must have the same
+ *                 resolution.
+ * @param buffer_frac the fraction of the display resolution to use for the LVGL
+ *                    draw buffer. A higher value will make animations smoother but
+ *                    also increase memory usage.
+ * @param full_refresh if true, the display will be fully refreshed on every frame.
+ *                     If false, only changed areas will be updated.
+ * @param draw_rounding the rounding to use when drawing. A value of 1 will draw
+ *                      without any rounding, a value of 2 will round to the nearest
+ *                      multiple of 2, and so on.
+ * @param resume_on_input if true, this component will resume rendering when the user
+ *                         presses a key or clicks on the screen.
+ */
+LvglComponent::LvglComponent(std::vector<display::Display *> displays, float buffer_frac, bool full_refresh,
+                             int draw_rounding, bool resume_on_input)
+    : draw_rounding(draw_rounding),
+      displays_(std::move(displays)),
+      buffer_frac_(buffer_frac),
+      full_refresh_(full_refresh),
+      resume_on_input_(resume_on_input) {
   lv_init();
   lv_update_event = static_cast<lv_event_code_t>(lv_event_register_id());
   lv_api_event = static_cast<lv_event_code_t>(lv_event_register_id());
   auto *display = this->displays_[0];
   size_t buffer_pixels = display->get_width() * display->get_height() / this->buffer_frac_;
   auto buf_bytes = buffer_pixels * LV_COLOR_DEPTH / 8;
-  auto *buf = lv_custom_mem_alloc(buf_bytes);  // NOLINT
+  this->rotation = display->get_rotation();
-  if (buf == nullptr) {
+  if (this->rotation != display::DISPLAY_ROTATION_0_DEGREES) {
-#if ESPHOME_LOG_LEVEL >= ESPHOME_LOG_LEVEL_ERROR
+    this->rotate_buf_ = static_cast<lv_color_t *>(lv_custom_mem_alloc(buf_bytes));  // NOLINT
-    ESP_LOGE(TAG, "Malloc failed to allocate %zu bytes", buf_bytes);
+    if (this->rotate_buf_ == nullptr)
-#endif
-    this->mark_failed();
-    this->status_set_error("Memory allocation failure");
       return;
   }
+  auto *buf = lv_custom_mem_alloc(buf_bytes);  // NOLINT
+  if (buf == nullptr)
+    return;
   lv_disp_draw_buf_init(&this->draw_buf_, buf, nullptr, buffer_pixels);
   lv_disp_drv_init(&this->disp_drv_);
   this->disp_drv_.draw_buf = &this->draw_buf_;
@@ -375,18 +426,7 @@ void LvglComponent::setup() {
   this->disp_drv_.full_refresh = this->full_refresh_;
   this->disp_drv_.flush_cb = static_flush_cb;
   this->disp_drv_.rounder_cb = rounder_cb;
-  this->rotation = display->get_rotation();
+  // reset the display rotation since we will handle all rotations
-  if (this->rotation != display::DISPLAY_ROTATION_0_DEGREES) {
-    this->rotate_buf_ = static_cast<lv_color_t *>(lv_custom_mem_alloc(buf_bytes));  // NOLINT
-    if (this->rotate_buf_ == nullptr) {
-#if ESPHOME_LOG_LEVEL >= ESPHOME_LOG_LEVEL_ERROR
-      ESP_LOGE(TAG, "Malloc failed to allocate %zu bytes", buf_bytes);
-#endif
-      this->mark_failed();
-      this->status_set_error("Memory allocation failure");
-      return;
-    }
-  }
   display->set_rotation(display::DISPLAY_ROTATION_0_DEGREES);
   switch (this->rotation) {
     default:
@@ -400,12 +440,30 @@ void LvglComponent::setup() {
       break;
   }
   this->disp_ = lv_disp_drv_register(&this->disp_drv_);
-  for (const auto &v : this->init_lambdas_)
+}
-    v(this);
+
+void LvglComponent::setup() {
+  if (this->draw_buf_.buf1 == nullptr) {
+    this->mark_failed();
+    this->status_set_error("Memory allocation failure");
+    return;
+  }
+  ESP_LOGCONFIG(TAG, "LVGL Setup starts");
+#if LV_USE_LOG
+  lv_log_register_print_cb([](const char *buf) {
+    auto next = strchr(buf, ')');
+    if (next != nullptr)
+      buf = next + 1;
+    while (isspace(*buf))
+      buf++;
+    esp_log_printf_(LVGL_LOG_LEVEL, TAG, 0, "%.*s", (int) strlen(buf) - 1, buf);
+  });
+#endif
   this->show_page(0, LV_SCR_LOAD_ANIM_NONE, 0);
   lv_disp_trig_activity(this->disp_);
   ESP_LOGCONFIG(TAG, "LVGL Setup complete");
 }
+
 void LvglComponent::update() {
   // update indicators
   if (this->paused_) {
@@ -420,13 +478,6 @@ void LvglComponent::loop() {
   }
   lv_timer_handler_run_in_period(5);
 }
-bool lv_is_pre_initialise() {
-  if (!lv_is_initialized()) {
-    ESP_LOGE(TAG, "LVGL call before component is initialised");
-    return true;
-  }
-  return false;
-}
 
 #ifdef USE_LVGL_ANIMIMG
 void lv_animimg_stop(lv_obj_t *obj) {

esphome/components/lvgl/lvgl_esphome.h

@@ -18,11 +18,9 @@
 #include "esphome/core/component.h"
 #include "esphome/core/log.h"
 #include <lvgl.h>
-#include <vector>
 #include <map>
-#ifdef USE_LVGL_IMAGE
+#include <utility>
-#include "esphome/components/image/image.h"
+#include <vector>
-#endif  // USE_LVGL_IMAGE
 
 #ifdef USE_LVGL_FONT
 #include "esphome/components/font/font.h"
@@ -41,7 +39,6 @@ namespace lvgl {
 extern lv_event_code_t lv_api_event;     // NOLINT
 extern lv_event_code_t lv_update_event;  // NOLINT
 extern std::string lv_event_code_name_for(uint8_t event_code);
-extern bool lv_is_pre_initialise();
 #if LV_COLOR_DEPTH == 16
 static const display::ColorBitness LV_BITNESS = display::ColorBitness::COLOR_BITNESS_565;
 #elif LV_COLOR_DEPTH == 32
@@ -110,6 +107,8 @@ class LvglComponent : public PollingComponent {
   constexpr static const char *const TAG = "lvgl";
 
  public:
+  LvglComponent(std::vector<display::Display *> displays, float buffer_frac, bool full_refresh, int draw_rounding,
+                bool resume_on_input);
   static void static_flush_cb(lv_disp_drv_t *disp_drv, const lv_area_t *area, lv_color_t *color_p);
 
   float get_setup_priority() const override { return setup_priority::PROCESSOR; }
@@ -120,13 +119,10 @@ class LvglComponent : public PollingComponent {
     this->idle_callbacks_.add(std::move(callback));
   }
   void add_on_pause_callback(std::function<void(bool)> &&callback) { this->pause_callbacks_.add(std::move(callback)); }
-  void add_display(display::Display *display) { this->displays_.push_back(display); }
-  void add_init_lambda(const std::function<void(LvglComponent *)> &lamb) { this->init_lambdas_.push_back(lamb); }
   void dump_config() override;
-  void set_full_refresh(bool full_refresh) { this->full_refresh_ = full_refresh; }
   bool is_idle(uint32_t idle_ms) { return lv_disp_get_inactive_time(this->disp_) > idle_ms; }
-  void set_buffer_frac(size_t frac) { this->buffer_frac_ = frac; }
   lv_disp_t *get_disp() { return this->disp_; }
+  lv_obj_t *get_scr_act() { return lv_disp_get_scr_act(this->disp_); }
   // Pause or resume the display.
   // @param paused If true, pause the display. If false, resume the display.
   // @param show_snow If true, show the snow effect when paused.
@@ -157,17 +153,19 @@ class LvglComponent : public PollingComponent {
   }
   // rounding factor to align bounds of update area when drawing
   size_t draw_rounding{2};
-  void set_draw_rounding(size_t rounding) { this->draw_rounding = rounding; }
-  void set_resume_on_input(bool resume_on_input) { this->resume_on_input_ = resume_on_input; }
 
-  // if set to true, the bounds of the update area will always start at 0,0
   display::DisplayRotation rotation{display::DISPLAY_ROTATION_0_DEGREES};
 
  protected:
   void write_random_();
   void draw_buffer_(const lv_area_t *area, lv_color_t *ptr);
   void flush_cb_(lv_disp_drv_t *disp_drv, const lv_area_t *area, lv_color_t *color_p);
+
   std::vector<display::Display *> displays_{};
+  size_t buffer_frac_{1};
+  bool full_refresh_{};
+  bool resume_on_input_{};
+
   lv_disp_draw_buf_t draw_buf_{};
   lv_disp_drv_t disp_drv_{};
   lv_disp_t *disp_{};
@@ -176,14 +174,10 @@ class LvglComponent : public PollingComponent {
   size_t current_page_{0};
   bool show_snow_{};
   bool page_wrap_{true};
-  bool resume_on_input_{};
   std::map<lv_group_t *, lv_obj_t *> focus_marks_{};
 
-  std::vector<std::function<void(LvglComponent *lv_component)>> init_lambdas_;
   CallbackManager<void(uint32_t)> idle_callbacks_{};
   CallbackManager<void(bool)> pause_callbacks_{};
-  size_t buffer_frac_{1};
-  bool full_refresh_{};
   lv_color_t *rotate_buf_{};
 };
 
@@ -246,6 +240,7 @@ class LVEncoderListener : public Parented<LvglComponent> {
  public:
   LVEncoderListener(lv_indev_type_t type, uint16_t lpt, uint16_t lprt);
 
+#ifdef USE_BINARY_SENSOR
   void set_left_button(binary_sensor::BinarySensor *left_button) {
     left_button->add_on_state_callback([this](bool state) { this->event(LV_KEY_LEFT, state); });
   }
@@ -256,6 +251,7 @@ class LVEncoderListener : public Parented<LvglComponent> {
   void set_enter_button(binary_sensor::BinarySensor *enter_button) {
     enter_button->add_on_state_callback([this](bool state) { this->event(LV_KEY_ENTER, state); });
   }
+#endif
 
 #ifdef USE_LVGL_ROTARY_ENCODER
   void set_sensor(rotary_encoder::RotaryEncoderSensor *sensor) {
@@ -292,6 +288,48 @@ class LVEncoderListener : public Parented<LvglComponent> {
 };
 #endif  //  USE_LVGL_KEY_LISTENER
 
+#if defined(USE_LVGL_DROPDOWN) || defined(LV_USE_ROLLER)
+class LvSelectable : public LvCompound {
+ public:
+  virtual size_t get_selected_index() = 0;
+  virtual void set_selected_index(size_t index, lv_anim_enable_t anim) = 0;
+  void set_selected_text(const std::string &text, lv_anim_enable_t anim);
+  std::string get_selected_text();
+  std::vector<std::string> get_options() { return this->options_; }
+  void set_options(std::vector<std::string> options);
+
+ protected:
+  virtual void set_option_string(const char *options) = 0;
+  std::vector<std::string> options_{};
+};
+
+#ifdef USE_LVGL_DROPDOWN
+class LvDropdownType : public LvSelectable {
+ public:
+  size_t get_selected_index() override { return lv_dropdown_get_selected(this->obj); }
+  void set_selected_index(size_t index, lv_anim_enable_t anim) override { lv_dropdown_set_selected(this->obj, index); }
+
+ protected:
+  void set_option_string(const char *options) override { lv_dropdown_set_options(this->obj, options); }
+};
+#endif  // USE_LVGL_DROPDOWN
+
+#ifdef USE_LVGL_ROLLER
+class LvRollerType : public LvSelectable {
+ public:
+  size_t get_selected_index() override { return lv_roller_get_selected(this->obj); }
+  void set_selected_index(size_t index, lv_anim_enable_t anim) override {
+    lv_roller_set_selected(this->obj, index, anim);
+  }
+  void set_mode(lv_roller_mode_t mode) { this->mode_ = mode; }
+
+ protected:
+  void set_option_string(const char *options) override { lv_roller_set_options(this->obj, options, this->mode_); }
+  lv_roller_mode_t mode_{LV_ROLLER_MODE_NORMAL};
+};
+#endif
+#endif  // defined(USE_LVGL_DROPDOWN) || defined(LV_USE_ROLLER)
+
 #ifdef USE_LVGL_BUTTONMATRIX
 class LvButtonMatrixType : public key_provider::KeyProvider, public LvCompound {
  public:

esphome/components/lvgl/schemas.py

@@ -216,7 +216,7 @@ def automation_schema(typ: LvType):
         events = df.LV_EVENT_TRIGGERS + (CONF_ON_VALUE,)
     else:
         events = df.LV_EVENT_TRIGGERS
-    args = [typ.get_arg_type()] if isinstance(typ, LvType) else []
+    args = typ.get_arg_type() if isinstance(typ, LvType) else []
     args.append(lv_event_t_ptr)
     return {
         cv.Optional(event): validate_automation(

esphome/components/lvgl/select/__init__.py

@@ -3,18 +3,10 @@ from esphome.components import select
 import esphome.config_validation as cv
 from esphome.const import CONF_OPTIONS
 
-from ..defines import CONF_ANIMATED, CONF_LVGL_ID, CONF_WIDGET
+from ..defines import CONF_ANIMATED, CONF_LVGL_ID, CONF_WIDGET, literal
-from ..lvcode import (
+from ..lvcode import LvContext
-    API_EVENT,
-    EVENT_ARG,
-    UPDATE_EVENT,
-    LambdaContext,
-    LvContext,
-    lv,
-    lv_add,
-)
 from ..schemas import LVGL_SCHEMA
-from ..types import LV_EVENT, LvSelect, lvgl_ns
+from ..types import LvSelect, lvgl_ns
 from ..widgets import get_widgets, wait_for_widgets
 
 LVGLSelect = lvgl_ns.class_("LVGLSelect", select.Select)
@@ -38,20 +30,10 @@ async def to_code(config):
     selector = await select.new_select(config, options=options)
     paren = await cg.get_variable(config[CONF_LVGL_ID])
     await wait_for_widgets()
-    async with LambdaContext(EVENT_ARG) as pub_ctx:
-        pub_ctx.add(selector.publish_index(widget.get_value()))
-    async with LambdaContext([(cg.uint16, "v")]) as control:
-        await widget.set_property("selected", "v", animated=config[CONF_ANIMATED])
-        lv.event_send(widget.obj, API_EVENT, cg.nullptr)
-        control.add(selector.publish_index(widget.get_value()))
     async with LvContext(paren) as ctx:
-        lv_add(selector.set_control_lambda(await control.get_lambda()))
         ctx.add(
-            paren.add_event_cb(
+            selector.set_widget(
-                widget.obj,
+                widget.var,
-                await pub_ctx.get_lambda(),
+                literal("LV_ANIM_ON" if config[CONF_ANIMATED] else "LV_ANIM_OFF"),
-                LV_EVENT.VALUE_CHANGED,
-                UPDATE_EVENT,
             )
         )
-        lv_add(selector.publish_index(widget.get_value()))

esphome/components/lvgl/select/lvgl_select.h

@@ -6,58 +6,52 @@
 #include "esphome/core/automation.h"
 #include "esphome/core/component.h"
 #include "esphome/core/preferences.h"
+#include "../lvgl.h"
 
 namespace esphome {
 namespace lvgl {
 
-static std::vector<std::string> split_string(const std::string &str) {
-  std::vector<std::string> strings;
-  auto delimiter = std::string("\n");
-
-  std::string::size_type pos;
-  std::string::size_type prev = 0;
-  while ((pos = str.find(delimiter, prev)) != std::string::npos) {
-    strings.push_back(str.substr(prev, pos - prev));
-    prev = pos + delimiter.size();
-  }
-
-  // To get the last substring (or only, if delimiter is not found)
-  strings.push_back(str.substr(prev));
-
-  return strings;
-}
-
 class LVGLSelect : public select::Select {
  public:
-  void set_control_lambda(std::function<void(size_t)> lambda) {
+  void set_widget(LvSelectable *widget, lv_anim_enable_t anim = LV_ANIM_OFF) {
-    this->control_lambda_ = std::move(lambda);
+    this->widget_ = widget;
+    this->anim_ = anim;
+    this->set_options_();
+    lv_obj_add_event_cb(
+        this->widget_->obj,
+        [](lv_event_t *e) {
+          auto *it = static_cast<LVGLSelect *>(e->user_data);
+          it->set_options_();
+        },
+        LV_EVENT_REFRESH, this);
     if (this->initial_state_.has_value()) {
       this->control(this->initial_state_.value());
       this->initial_state_.reset();
     }
+    this->publish();
+    auto lamb = [](lv_event_t *e) {
+      auto *self = static_cast<LVGLSelect *>(e->user_data);
+      self->publish();
+    };
+    lv_obj_add_event_cb(this->widget_->obj, lamb, LV_EVENT_VALUE_CHANGED, this);
+    lv_obj_add_event_cb(this->widget_->obj, lamb, lv_update_event, this);
   }
 
-  void publish_index(size_t index) {
+  void publish() { this->publish_state(this->widget_->get_selected_text()); }
-    auto value = this->at(index);
-    if (value)
-      this->publish_state(value.value());
-  }
-
-  void set_options(const char *str) { this->traits.set_options(split_string(str)); }
 
  protected:
   void control(const std::string &value) override {
-    if (this->control_lambda_ != nullptr) {
+    if (this->widget_ != nullptr) {
-      auto index = index_of(value);
+      this->widget_->set_selected_text(value, this->anim_);
-      if (index)
-        this->control_lambda_(index.value());
     } else {
-      this->initial_state_ = value.c_str();
+      this->initial_state_ = value;
     }
   }
+  void set_options_() { this->traits.set_options(this->widget_->get_options()); }
 
-  std::function<void(size_t)> control_lambda_{};
+  LvSelectable *widget_{};
-  optional<const char *> initial_state_{};
+  optional<std::string> initial_state_{};
+  lv_anim_enable_t anim_{LV_ANIM_OFF};
 };
 
 }  // namespace lvgl

esphome/components/lvgl/styles.py

@@ -17,8 +17,6 @@ from .types import lv_lambda_t, lv_obj_t, lv_obj_t_ptr
 from .widgets import Widget, add_widgets, set_obj_properties, theme_widget_map
 from .widgets.obj import obj_spec
 
-TOP_LAYER = literal("lv_disp_get_layer_top(lv_component->get_disp())")
-
 
 async def styles_to_code(config):
     """Convert styles to C__ code."""
@@ -51,9 +49,10 @@ async def theme_to_code(config):
             lv_assign(apply, await context.get_lambda())
 
 
-async def add_top_layer(config):
+async def add_top_layer(lv_component, config):
+    top_layer = lv.disp_get_layer_top(lv_component.get_disp())
     if top_conf := config.get(CONF_TOP_LAYER):
-        with LocalVariable("top_layer", lv_obj_t, TOP_LAYER) as top_layer_obj:
+        with LocalVariable("top_layer", lv_obj_t, top_layer) as top_layer_obj:
             top_w = Widget(top_layer_obj, obj_spec, top_conf)
             await set_obj_properties(top_w, top_conf)
             await add_widgets(top_w, top_conf)

esphome/components/lvgl/trigger.py

@@ -67,9 +67,9 @@ async def add_trigger(conf, lv_component, w, *events):
     tid = conf[CONF_TRIGGER_ID]
     trigger = cg.new_Pvariable(tid)
     args = w.get_args() + [(lv_event_t_ptr, "event")]
-    value = w.get_value()
+    value = w.get_values()
     await automation.build_automation(trigger, args, conf)
     async with LambdaContext(EVENT_ARG, where=tid) as context:
         with LvConditional(w.is_selected()):
-            lv_add(trigger.trigger(value, literal("event")))
+            lv_add(trigger.trigger(*value, literal("event")))
     lv_add(lv_component.add_event_cb(w.obj, await context.get_lambda(), *events))

esphome/components/lvgl/types.py

@@ -18,7 +18,9 @@ class LvType(cg.MockObjClass):
         self.value_property = None
 
     def get_arg_type(self):
-        return self.args[0][0] if len(self.args) else None
+        if len(self.args) == 0:
+            return None
+        return [arg[0] for arg in self.args]
 
 
 class LvNumber(LvType):
@@ -92,11 +94,13 @@ class LvBoolean(LvType):
 
 class LvSelect(LvType):
     def __init__(self, *args, **kwargs):
+        parens = kwargs.pop("parents", ()) + (LvCompound,)
         super().__init__(
             *args,
-            largs=[(cg.int_, "x")],
+            largs=[(cg.int_, "x"), (cg.std_string, "text")],
-            lvalue=lambda w: w.get_property("selected"),
+            lvalue=lambda w: [w.var.get_selected_index(), w.var.get_selected_text()],
             has_on_value=True,
+            parents=parens,
             **kwargs,
         )
 

esphome/components/lvgl/widgets/__init__.py

@@ -55,29 +55,14 @@ theme_widget_map = {}
 styles_used = set()
 
 
-class LvScrActType(WidgetType):
-    """
-    A "widget" representing the active screen.
-    """
-
-    def __init__(self):
-        super().__init__("lv_scr_act()", lv_obj_t, ())
-
-    async def to_code(self, w, config: dict):
-        return []
-
-
 class Widget:
     """
     Represents a Widget.
+    This class has a lot of methods. Adding any more runs foul of lint checks ("too many public methods").
     """
 
     widgets_completed = False
 
-    @staticmethod
-    def set_completed():
-        Widget.widgets_completed = True
-
     def __init__(self, var, wtype: WidgetType, config: dict = None):
         self.var = var
         self.type = wtype
@@ -179,9 +164,20 @@ class Widget:
 
     def get_value(self):
         if isinstance(self.type.w_type, LvType):
-            return self.type.w_type.value(self)
+            result = self.type.w_type.value(self)
+            if isinstance(result, list):
+                return result[0]
+            return result
         return self.obj
 
+    def get_values(self):
+        if isinstance(self.type.w_type, LvType):
+            result = self.type.w_type.value(self)
+            if isinstance(result, list):
+                return result
+            return [result]
+        return [self.obj]
+
     def get_number_value(self):
         value = self.type.mock_obj.get_value(self.obj)
         if self.scale == 1.0:
@@ -213,6 +209,25 @@ class Widget:
 widget_map: dict[Any, Widget] = {}
 
 
+class LvScrActType(WidgetType):
+    """
+    A "widget" representing the active screen.
+    """
+
+    def __init__(self):
+        super().__init__("lv_scr_act()", lv_obj_t, ())
+
+    async def to_code(self, w, config: dict):
+        return []
+
+
+lv_scr_act_spec = LvScrActType()
+
+
+def get_scr_act(lv_comp: MockObj) -> Widget:
+    return Widget.create(None, lv_comp.get_scr_act(), lv_scr_act_spec, {})
+
+
 def get_widget_generator(wid):
     """
     Used to wait for a widget during code generation.
@@ -443,7 +458,3 @@ async def widget_to_code(w_cnfig, w_type: WidgetType, parent):
     await set_obj_properties(w, w_cnfig)
     await add_widgets(w, w_cnfig)
     await spec.to_code(w, w_cnfig)
-
-
-lv_scr_act_spec = LvScrActType()
-lv_scr_act = Widget.create(None, literal("lv_scr_act()"), lv_scr_act_spec, {})

esphome/components/lvgl/widgets/dropdown.py

@@ -1,4 +1,3 @@
-import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.const import CONF_OPTIONS
 
@@ -9,21 +8,24 @@ from ..defines import (
     CONF_SCROLLBAR,
     CONF_SELECTED,
     CONF_SELECTED_INDEX,
+    CONF_SELECTED_TEXT,
     CONF_SYMBOL,
     DIRECTIONS,
     literal,
 )
+from ..helpers import lvgl_components_required
 from ..lv_validation import lv_int, lv_text, option_string
-from ..lvcode import LocalVariable, lv, lv_expr
+from ..lvcode import LocalVariable, lv, lv_add, lv_expr
 from ..schemas import part_schema
-from ..types import LvSelect, LvType, lv_obj_t
+from ..types import LvCompound, LvSelect, LvType, lv_obj_t
 from . import Widget, WidgetType, set_obj_properties
 from .label import CONF_LABEL
 
 CONF_DROPDOWN = "dropdown"
 CONF_DROPDOWN_LIST = "dropdown_list"
 
-lv_dropdown_t = LvSelect("lv_dropdown_t")
+lv_dropdown_t = LvSelect("LvDropdownType", parents=(LvCompound,))
+
 lv_dropdown_list_t = LvType("lv_dropdown_list_t")
 dropdown_list_spec = WidgetType(
     CONF_DROPDOWN_LIST, lv_dropdown_list_t, (CONF_MAIN, CONF_SELECTED, CONF_SCROLLBAR)
@@ -32,7 +34,8 @@ dropdown_list_spec = WidgetType(
 DROPDOWN_BASE_SCHEMA = cv.Schema(
     {
         cv.Optional(CONF_SYMBOL): lv_text,
-        cv.Optional(CONF_SELECTED_INDEX): cv.templatable(cv.int_),
+        cv.Exclusive(CONF_SELECTED_INDEX, CONF_SELECTED_TEXT): lv_int,
+        cv.Exclusive(CONF_SELECTED_TEXT, CONF_SELECTED_TEXT): lv_text,
         cv.Optional(CONF_DIR, default="BOTTOM"): DIRECTIONS.one_of,
         cv.Optional(CONF_DROPDOWN_LIST): part_schema(dropdown_list_spec),
     }
@@ -44,6 +47,12 @@ DROPDOWN_SCHEMA = DROPDOWN_BASE_SCHEMA.extend(
     }
 )
 
+DROPDOWN_UPDATE_SCHEMA = DROPDOWN_BASE_SCHEMA.extend(
+    {
+        cv.Optional(CONF_OPTIONS): cv.ensure_list(option_string),
+    }
+)
+
 
 class DropdownType(WidgetType):
     def __init__(self):
@@ -52,18 +61,21 @@ class DropdownType(WidgetType):
             lv_dropdown_t,
             (CONF_MAIN, CONF_INDICATOR),
             DROPDOWN_SCHEMA,
-            DROPDOWN_BASE_SCHEMA,
+            modify_schema=DROPDOWN_UPDATE_SCHEMA,
         )
 
     async def to_code(self, w: Widget, config):
+        lvgl_components_required.add(CONF_DROPDOWN)
         if options := config.get(CONF_OPTIONS):
-            text = cg.safe_exp("\n".join(options))
+            lv_add(w.var.set_options(options))
-            lv.dropdown_set_options(w.obj, text)
         if symbol := config.get(CONF_SYMBOL):
-            lv.dropdown_set_symbol(w.obj, await lv_text.process(symbol))
+            lv.dropdown_set_symbol(w.var.obj, await lv_text.process(symbol))
         if (selected := config.get(CONF_SELECTED_INDEX)) is not None:
             value = await lv_int.process(selected)
-            lv.dropdown_set_selected(w.obj, value)
+            lv_add(w.var.set_selected_index(value, literal("LV_ANIM_OFF")))
+        if (selected := config.get(CONF_SELECTED_TEXT)) is not None:
+            value = await lv_text.process(selected)
+            lv_add(w.var.set_selected_text(value, literal("LV_ANIM_OFF")))
         if dirn := config.get(CONF_DIR):
             lv.dropdown_set_dir(w.obj, literal(dirn))
         if dlist := config.get(CONF_DROPDOWN_LIST):

esphome/components/lvgl/widgets/msgbox.py

@@ -20,6 +20,7 @@ from ..lvcode import (
     EVENT_ARG,
     LambdaContext,
     LocalVariable,
+    lv,
     lv_add,
     lv_assign,
     lv_expr,
@@ -27,7 +28,6 @@ from ..lvcode import (
     lv_Pvariable,
 )
 from ..schemas import STYLE_SCHEMA, STYLED_TEXT_SCHEMA, container_schema, part_schema
-from ..styles import TOP_LAYER
 from ..types import LV_EVENT, char_ptr, lv_obj_t
 from . import Widget, set_obj_properties
 from .button import button_spec
@@ -59,7 +59,7 @@ MSGBOX_SCHEMA = container_schema(
 )
 
 
-async def msgbox_to_code(conf):
+async def msgbox_to_code(top_layer, conf):
     """
     Construct a message box. This consists of a full-screen translucent background enclosing a centered container
     with an optional title, body, close button and a button matrix. And any other widgets the user cares to add
@@ -101,7 +101,7 @@ async def msgbox_to_code(conf):
     text = await lv_text.process(conf[CONF_BODY].get(CONF_TEXT, ""))
     title = await lv_text.process(conf[CONF_TITLE].get(CONF_TEXT, ""))
     close_button = conf[CONF_CLOSE_BUTTON]
-    lv_assign(outer, lv_expr.obj_create(TOP_LAYER))
+    lv_assign(outer, lv_expr.obj_create(top_layer))
     lv_obj.set_width(outer, lv_pct(100))
     lv_obj.set_height(outer, lv_pct(100))
     lv_obj.set_style_bg_opa(outer, 128, 0)
@@ -141,6 +141,7 @@ async def msgbox_to_code(conf):
         set_btn_data(buttonmatrix.obj, ctrl_list, width_list)
 
 
-async def msgboxes_to_code(config):
+async def msgboxes_to_code(lv_component, config):
+    top_layer = lv.disp_get_layer_top(lv_component.get_disp())
     for conf in config.get(CONF_MSGBOXES, ()):
-        await msgbox_to_code(conf)
+        await msgbox_to_code(top_layer, conf)

esphome/components/lvgl/widgets/obj.py

@@ -1,7 +1,7 @@
 from esphome import automation
 
 from ..automation import update_to_code
-from ..defines import CONF_MAIN, CONF_OBJ
+from ..defines import CONF_MAIN, CONF_OBJ, CONF_SCROLLBAR
 from ..schemas import create_modify_schema
 from ..types import ObjUpdateAction, WidgetType, lv_obj_t
 
@@ -12,7 +12,9 @@ class ObjType(WidgetType):
     """
 
     def __init__(self):
-        super().__init__(CONF_OBJ, lv_obj_t, (CONF_MAIN,), schema={}, modify_schema={})
+        super().__init__(
+            CONF_OBJ, lv_obj_t, (CONF_MAIN, CONF_SCROLLBAR), schema={}, modify_schema={}
+        )
 
     async def to_code(self, w, config):
         return []

esphome/components/lvgl/widgets/roller.py

@@ -1,4 +1,3 @@
-import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.const import CONF_MODE, CONF_OPTIONS
 
@@ -7,36 +6,40 @@ from ..defines import (
     CONF_MAIN,
     CONF_SELECTED,
     CONF_SELECTED_INDEX,
+    CONF_SELECTED_TEXT,
     CONF_VISIBLE_ROW_COUNT,
     ROLLER_MODES,
     literal,
 )
-from ..lv_validation import animated, lv_int, option_string
+from ..helpers import lvgl_components_required
-from ..lvcode import lv
+from ..lv_validation import animated, lv_int, lv_text, option_string
+from ..lvcode import lv_add
 from ..types import LvSelect
 from . import WidgetType
 from .label import CONF_LABEL
 
 CONF_ROLLER = "roller"
-lv_roller_t = LvSelect("lv_roller_t")
+lv_roller_t = LvSelect("LvRollerType")
 
 ROLLER_BASE_SCHEMA = cv.Schema(
     {
-        cv.Optional(CONF_SELECTED_INDEX): cv.templatable(cv.int_),
+        cv.Exclusive(CONF_SELECTED_INDEX, CONF_SELECTED_TEXT): lv_int,
+        cv.Exclusive(CONF_SELECTED_TEXT, CONF_SELECTED_TEXT): lv_text,
         cv.Optional(CONF_VISIBLE_ROW_COUNT): lv_int,
+        cv.Optional(CONF_MODE): ROLLER_MODES.one_of,
     }
 )
 
 ROLLER_SCHEMA = ROLLER_BASE_SCHEMA.extend(
     {
         cv.Required(CONF_OPTIONS): cv.ensure_list(option_string),
-        cv.Optional(CONF_MODE, default="NORMAL"): ROLLER_MODES.one_of,
     }
 )
 
 ROLLER_MODIFY_SCHEMA = ROLLER_BASE_SCHEMA.extend(
     {
         cv.Optional(CONF_ANIMATED, default=True): animated,
+        cv.Optional(CONF_OPTIONS): cv.ensure_list(option_string),
     }
 )
 
@@ -52,15 +55,19 @@ class RollerType(WidgetType):
         )
 
     async def to_code(self, w, config):
+        lvgl_components_required.add(CONF_ROLLER)
+        if mode := config.get(CONF_MODE):
+            mode = await ROLLER_MODES.process(mode)
+            lv_add(w.var.set_mode(mode))
         if options := config.get(CONF_OPTIONS):
-            mode = await ROLLER_MODES.process(config[CONF_MODE])
+            lv_add(w.var.set_options(options))
-            text = cg.safe_exp("\n".join(options))
+        animopt = literal(config.get(CONF_ANIMATED, "LV_ANIM_OFF"))
-            lv.roller_set_options(w.obj, text, mode)
+        if (selected := config.get(CONF_SELECTED_INDEX)) is not None:
-        animopt = literal(config.get(CONF_ANIMATED) or "LV_ANIM_OFF")
-        if CONF_SELECTED_INDEX in config:
-            if selected := config[CONF_SELECTED_INDEX]:
             value = await lv_int.process(selected)
-                lv.roller_set_selected(w.obj, value, animopt)
+            lv_add(w.var.set_selected_index(value, animopt))
+        if (selected := config.get(CONF_SELECTED_TEXT)) is not None:
+            value = await lv_text.process(selected)
+            lv_add(w.var.set_selected_text(value, animopt))
         await w.set_property(
             CONF_VISIBLE_ROW_COUNT,
             await lv_int.process(config.get(CONF_VISIBLE_ROW_COUNT)),

esphome/components/lvgl/widgets/tileview.py

@@ -9,6 +9,7 @@ from ..defines import (
     CONF_COLUMN,
     CONF_DIR,
     CONF_MAIN,
+    CONF_SCROLLBAR,
     CONF_TILE_ID,
     CONF_TILES,
     TILE_DIRECTIONS,
@@ -56,7 +57,7 @@ class TileviewType(WidgetType):
         super().__init__(
             CONF_TILEVIEW,
             lv_tileview_t,
-            (CONF_MAIN,),
+            (CONF_MAIN, CONF_SCROLLBAR),
             schema=TILEVIEW_SCHEMA,
             modify_schema={},
         )

esphome/components/mlx90393/sensor.py

@@ -132,4 +132,4 @@ async def to_code(config):
         pin = await cg.gpio_pin_expression(config[CONF_DRDY_PIN])
         cg.add(var.set_drdy_gpio(pin))
 
-    cg.add_library("functionpointer/arduino-MLX90393", "1.0.0")
+    cg.add_library("functionpointer/arduino-MLX90393", "1.0.2")

esphome/components/speaker/__init__.py

@@ -2,7 +2,7 @@ from esphome import automation
 from esphome.automation import maybe_simple_id
 import esphome.codegen as cg
 import esphome.config_validation as cv
-from esphome.const import CONF_DATA, CONF_ID
+from esphome.const import CONF_DATA, CONF_ID, CONF_VOLUME
 from esphome.core import CORE
 from esphome.coroutine import coroutine_with_priority
 
@@ -23,6 +23,10 @@ StopAction = speaker_ns.class_(
 FinishAction = speaker_ns.class_(
     "FinishAction", automation.Action, cg.Parented.template(Speaker)
 )
+VolumeSetAction = speaker_ns.class_(
+    "VolumeSetAction", automation.Action, cg.Parented.template(Speaker)
+)
+
 
 IsPlayingCondition = speaker_ns.class_("IsPlayingCondition", automation.Condition)
 IsStoppedCondition = speaker_ns.class_("IsStoppedCondition", automation.Condition)
@@ -90,6 +94,25 @@ automation.register_condition(
 )(speaker_action)
 
 
+@automation.register_action(
+    "speaker.volume_set",
+    VolumeSetAction,
+    cv.maybe_simple_value(
+        {
+            cv.GenerateID(): cv.use_id(Speaker),
+            cv.Required(CONF_VOLUME): cv.templatable(cv.percentage),
+        },
+        key=CONF_VOLUME,
+    ),
+)
+async def speaker_volume_set_action(config, action_id, template_arg, args):
+    var = cg.new_Pvariable(action_id, template_arg)
+    await cg.register_parented(var, config[CONF_ID])
+    volume = await cg.templatable(config[CONF_VOLUME], args, float)
+    cg.add(var.set_volume(volume))
+    return var
+
+
 @coroutine_with_priority(100.0)
 async def to_code(config):
     cg.add_global(speaker_ns.using)

esphome/components/speaker/automation.h

@@ -34,6 +34,11 @@ template<typename... Ts> class PlayAction : public Action<Ts...>, public Parente
   std::vector<uint8_t> data_static_{};
 };
 
+template<typename... Ts> class VolumeSetAction : public Action<Ts...>, public Parented<Speaker> {
+  TEMPLATABLE_VALUE(float, volume)
+  void play(Ts... x) override { this->parent_->set_volume(this->volume_.value(x...)); }
+};
+
 template<typename... Ts> class StopAction : public Action<Ts...>, public Parented<Speaker> {
  public:
   void play(Ts... x) override { this->parent_->stop(); }

esphome/components/speaker/speaker.h

@@ -4,6 +4,12 @@
 #include <cstdint>
 #include <vector>
 
+#ifdef USE_ESP32
+#include <freertos/FreeRTOS.h>
+#endif
+
+#include "esphome/components/audio/audio.h"
+
 namespace esphome {
 namespace speaker {
 
@@ -16,14 +22,33 @@ enum State : uint8_t {
 
 class Speaker {
  public:
+#ifdef USE_ESP32
+  /// @brief Plays the provided audio data.
+  /// If the speaker component doesn't implement this method, it falls back to the play method without this parameter.
+  /// @param data Audio data in the format specified by ``set_audio_stream_info`` method.
+  /// @param length The length of the audio data in bytes.
+  /// @param ticks_to_wait The FreeRTOS ticks to wait before writing as much data as possible to the ring buffer.
+  /// @return The number of bytes that were actually written to the speaker's internal buffer.
+  virtual size_t play(const uint8_t *data, size_t length, TickType_t ticks_to_wait) {
+    return this->play(data, length);
+  };
+#endif
+
+  /// @brief Plays the provided audio data.
+  /// If the audio stream is not the default defined in "esphome/core/audio.h" and the speaker component implements it,
+  /// then this should be called after calling ``set_audio_stream_info``.
+  /// @param data Audio data in the format specified by ``set_audio_stream_info`` method.
+  /// @param length The length of the audio data in bytes.
+  /// @return The number of bytes that were actually written to the speaker's internal buffer.
   virtual size_t play(const uint8_t *data, size_t length) = 0;
+
   size_t play(const std::vector<uint8_t> &data) { return this->play(data.data(), data.size()); }
 
   virtual void start() = 0;
   virtual void stop() = 0;
   // In compare between *STOP()* and *FINISH()*; *FINISH()* will stop after emptying the play buffer,
   // while *STOP()* will break directly.
-  // When finish() is not implemented on the plateform component it should just do a normal stop.
+  // When finish() is not implemented on the platform component it should just do a normal stop.
   virtual void finish() { this->stop(); }
 
   virtual bool has_buffered_data() const = 0;
@@ -31,8 +56,18 @@ class Speaker {
   bool is_running() const { return this->state_ == STATE_RUNNING; }
   bool is_stopped() const { return this->state_ == STATE_STOPPED; }
 
+  // Volume control must be implemented by each speaker component, otherwise it will have no effect.
+  virtual void set_volume(float volume) { this->volume_ = volume; };
+  virtual float get_volume() { return this->volume_; }
+
+  void set_audio_stream_info(const audio::AudioStreamInfo &audio_stream_info) {
+    this->audio_stream_info_ = audio_stream_info;
+  }
+
  protected:
   State state_{STATE_STOPPED};
+  audio::AudioStreamInfo audio_stream_info_;
+  float volume_{1.0f};
 };
 
 }  // namespace speaker

esphome/components/udp/udp_component.cpp

@@ -261,7 +261,8 @@ void UDPComponent::setup() {
       return;
     }
   }
-#else
+#endif
+#ifdef USE_SOCKET_IMPL_LWIP_TCP
   // 8266 and RP2040 `Duino
   for (const auto &address : this->addresses_) {
     auto ipaddr = IPAddress();
@@ -370,7 +371,8 @@ void UDPComponent::loop() {
     for (;;) {
 #if defined(USE_SOCKET_IMPL_BSD_SOCKETS) || defined(USE_SOCKET_IMPL_LWIP_SOCKETS)
       auto len = this->listen_socket_->read(buf, sizeof(buf));
-#else
+#endif
+#ifdef USE_SOCKET_IMPL_LWIP_TCP
       auto len = this->udp_client_.parsePacket();
       if (len > 0)
         len = this->udp_client_.read(buf, sizeof(buf));
@@ -587,7 +589,8 @@ void UDPComponent::send_packet_(void *data, size_t len) {
     if (result < 0)
       ESP_LOGW(TAG, "sendto() error %d", errno);
   }
-#else
+#endif
+#ifdef USE_SOCKET_IMPL_LWIP_TCP
   auto iface = IPAddress(0, 0, 0, 0);
   for (const auto &saddr : this->ipaddrs_) {
     if (this->udp_client_.beginPacketMulticast(saddr, this->port_, iface, 128) != 0) {

esphome/components/udp/udp_component.h

@@ -9,7 +9,8 @@
 #endif
 #if defined(USE_SOCKET_IMPL_BSD_SOCKETS) || defined(USE_SOCKET_IMPL_LWIP_SOCKETS)
 #include "esphome/components/socket/socket.h"
-#else
+#endif
+#ifdef USE_SOCKET_IMPL_LWIP_TCP
 #include <WiFiUdp.h>
 #endif
 #include <vector>
@@ -125,7 +126,8 @@ class UDPComponent : public PollingComponent {
   std::unique_ptr<socket::Socket> broadcast_socket_ = nullptr;
   std::unique_ptr<socket::Socket> listen_socket_ = nullptr;
   std::vector<struct sockaddr> sockaddrs_{};
-#else
+#endif
+#ifdef USE_SOCKET_IMPL_LWIP_TCP
   std::vector<IPAddress> ipaddrs_{};
   WiFiUDP udp_client_{};
 #endif

esphome/config.py

@@ -782,7 +782,7 @@ def validate_config(
         from esphome.components import substitutions
 
         result[CONF_SUBSTITUTIONS] = {
-            **config.get(CONF_SUBSTITUTIONS, {}),
+            **(config.get(CONF_SUBSTITUTIONS) or {}),
             **command_line_substitutions,
         }
         result.add_output_path([CONF_SUBSTITUTIONS], CONF_SUBSTITUTIONS)

esphome/core/defines.h

@@ -44,10 +44,12 @@
 #define USE_LVGL_ANIMIMG
 #define USE_LVGL_BINARY_SENSOR
 #define USE_LVGL_BUTTONMATRIX
+#define USE_LVGL_DROPDOWN
 #define USE_LVGL_FONT
 #define USE_LVGL_IMAGE
 #define USE_LVGL_KEY_LISTENER
 #define USE_LVGL_KEYBOARD
+#define USE_LVGL_ROLLER
 #define USE_LVGL_ROTARY_ENCODER
 #define USE_LVGL_TOUCHSCREEN
 #define USE_MD5

platformio.ini

@@ -38,7 +38,7 @@ lib_deps =
     improv/Improv@1.2.4                    ; improv_serial / esp32_improv
     bblanchon/ArduinoJson@6.18.5           ; json
     wjtje/qr-code-generator-library@1.7.0  ; qr_code
-    functionpointer/arduino-MLX90393@1.0.0 ; mlx90393
+    functionpointer/arduino-MLX90393@1.0.2 ; mlx90393
     pavlodn/HaierProtocol@0.9.31           ; haier
     kikuchan98/pngle@1.0.2                 ; online_image
     ; This is using the repository until a new release is published to PlatformIO

tests/components/axs15231/common.yaml

@@ -0,0 +1,20 @@
+i2c:
+  - id: i2c_axs15231
+    scl: 3
+    sda: 21
+
+display:
+  - platform: ssd1306_i2c
+    id: ssd1306_display
+    model: SSD1306_128X64
+    reset_pin: 19
+    pages:
+      - id: page1
+        lambda: |-
+          it.rectangle(0, 0, it.get_width(), it.get_height());
+
+touchscreen:
+  - platform: axs15231
+    display: ssd1306_display
+    interrupt_pin: 20
+    reset_pin: 18

tests/components/axs15231/test.esp32-ard.yaml

@@ -0,0 +1 @@
+<<: !include common.yaml

tests/components/axs15231/test.esp32-c3-ard.yaml

@@ -0,0 +1 @@
+<<: !include common.yaml

tests/components/axs15231/test.esp32-c3-idf.yaml

@@ -0,0 +1 @@
+<<: !include common.yaml

tests/components/axs15231/test.esp32-idf.yaml

@@ -0,0 +1 @@
+<<: !include common.yaml

tests/components/axs15231/test.esp8266-ard.yaml

@@ -0,0 +1,19 @@
+i2c:
+  - id: i2c_axs15231
+    scl: 5
+    sda: 4
+
+display:
+  - platform: ssd1306_i2c
+    id: ssd1306_display
+    model: SSD1306_128X64
+    reset_pin: 13
+    pages:
+      - id: page1
+        lambda: |-
+          it.rectangle(0, 0, it.get_width(), it.get_height());
+
+touchscreen:
+  - platform: axs15231
+    display: ssd1306_display
+    interrupt_pin: 12

tests/components/axs15231/test.rp2040-ard.yaml

@@ -0,0 +1 @@
+<<: !include common.yaml

tests/components/lvgl/lvgl-package.yaml

@@ -12,12 +12,12 @@ substitutions:
   arrow_down: "\U000F004B"
 
 lvgl:
+  log_level: debug
   resume_on_input: true
   on_pause:
     logger.log: LVGL is Paused
   on_resume:
     logger.log: LVGL has resumed
-  log_level: TRACE
   bg_color: light_blue
   disp_bg_color: color_id
   disp_bg_image: cat_image
@@ -125,6 +125,8 @@ lvgl:
       on_unload:
         - logger.log: page unloaded
         - lvgl.widget.focus: mark
+        - lvgl.widget.redraw: hello_label
+        - lvgl.widget.redraw:
       on_all_events:
         logger.log:
           format: "Event %s"
@@ -138,6 +140,19 @@ lvgl:
         flex_align_cross: start
         flex_align_track: end
       widgets:
+        - roller:
+            id: lv_roller
+            visible_row_count: 2
+            anim_time: 500ms
+            options:
+              - Nov
+              - Dec
+            selected_index: 1
+            on_value:
+              then:
+                - logger.log:
+                    format: "Roller changed = %d: %s"
+                    args: [x, text.c_str()]
         - animimg:
             height: 60
             id: anim_img
@@ -245,9 +260,13 @@ lvgl:
             y: 120
         - buttonmatrix:
             on_press:
-              logger.log:
+              then:
+                - logger.log:
                     format: "matrix button pressed: %d"
                     args: ["x"]
+                - lvgl.widget.show: b_matrix
+                - lvgl.widget.redraw:
+
             on_long_press:
               lvgl.matrix.button.update:
                 id: [button_a, button_e, button_c]
@@ -629,8 +648,6 @@ lvgl:
                         - First
                         - Second
                         - Third
-                        - 4th
-                        - 5th
                         - 6th
                         - 7th
                         - 8th
@@ -651,8 +668,8 @@ lvgl:
                           bg_color: 0xFF
                       on_value:
                         logger.log:
-                          format: "Dropdown changed = %d"
+                          format: "Dropdown changed = %d: %s"
-                          args: [x]
+                          args: [x, text.c_str()]
                       on_cancel:
                         logger.log:
                           format: "Dropdown closed = %d"
@@ -661,6 +678,11 @@ lvgl:
                       src: cat_image
                       on_click:
                         then:
+                          - lvgl.dropdown.update:
+                              id: lv_dropdown
+                              options:
+                                ["First", "Second", "Third", "4th", "5th", "6th", "7th", "8th", "9th", "10th", "11th"]
+                              selected_index: 3
                           - logger.log: Cat image clicked
                           - lvgl.tabview.select:
                               id: tabview_id

tests/components/speaker/test.esp32-ard.yaml

@@ -5,6 +5,7 @@ esphome:
           condition: speaker.is_stopped
           then:
             - speaker.play: [0, 1, 2, 3]
+      - speaker.volume_set: 0.9
       - if:
           condition: speaker.is_playing
           then:

tests/components/speaker/test.esp32-c3-ard.yaml

@@ -5,6 +5,7 @@ esphome:
           condition: speaker.is_stopped
           then:
             - speaker.play: [0, 1, 2, 3]
+      - speaker.volume_set: 0.9
       - if:
           condition: speaker.is_playing
           then:

tests/components/speaker/test.esp32-c3-idf.yaml

@@ -5,6 +5,7 @@ esphome:
           condition: speaker.is_stopped
           then:
             - speaker.play: [0, 1, 2, 3]
+      - speaker.volume_set: 0.9
       - if:
           condition: speaker.is_playing
           then:

tests/components/speaker/test.esp32-idf.yaml

@@ -5,6 +5,7 @@ esphome:
           condition: speaker.is_stopped
           then:
             - speaker.play: [0, 1, 2, 3]
+      - speaker.volume_set: 0.9
       - if:
           condition: speaker.is_playing
           then: