Merge branch 'dev' into defaults2

.github/workflows/ci.yml

@@ -219,7 +219,7 @@ jobs:
           . venv/bin/activate
           pytest -vv --cov-report=xml --tb=native tests
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v4
+        uses: codecov/codecov-action@v5
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
 

esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp

@@ -65,6 +65,9 @@ void ESP32BLETracker::setup() {
       [this](ota::OTAState state, float progress, uint8_t error, ota::OTAComponent *comp) {
         if (state == ota::OTA_STARTED) {
           this->stop_scan();
+          for (auto *client : this->clients_) {
+            client->disconnect();
+          }
         }
       });
 #endif

esphome/components/i2s_audio/speaker/i2s_audio_speaker.cpp

@@ -99,14 +99,6 @@ void I2SAudioSpeaker::setup() {
     this->mark_failed();
     return;
   }
-
-  this->i2s_event_queue_ = xQueueCreate(I2S_EVENT_QUEUE_COUNT, sizeof(i2s_event_t));
-
-  if (this->i2s_event_queue_ == nullptr) {
-    ESP_LOGE(TAG, "Failed to create I2S event queue");
-    this->mark_failed();
-    return;
-  }
 }
 
 void I2SAudioSpeaker::loop() {
@@ -339,7 +331,7 @@ void I2SAudioSpeaker::speaker_task(void *params) {
 }
 
 void I2SAudioSpeaker::start() {
-  if (this->is_failed() || this->status_has_error())
+  if (!this->is_ready() || this->is_failed() || this->status_has_error())
     return;
   if ((this->state_ == speaker::STATE_STARTING) || (this->state_ == speaker::STATE_RUNNING))
     return;
@@ -519,7 +511,6 @@ void I2SAudioSpeaker::delete_task_(size_t buffer_size) {
   }
 
   xEventGroupSetBits(this->event_group_, SpeakerEventGroupBits::STATE_STOPPED);
-  xQueueReset(this->i2s_event_queue_);
 
   this->task_created_ = false;
   vTaskDelete(nullptr);

esphome/components/i2s_audio/speaker/i2s_audio_speaker.h

@@ -23,7 +23,7 @@ namespace i2s_audio {
 
 class I2SAudioSpeaker : public I2SAudioOut, public speaker::Speaker, public Component {
  public:
-  float get_setup_priority() const override { return esphome::setup_priority::LATE; }
+  float get_setup_priority() const override { return esphome::setup_priority::PROCESSOR; }
 
   void setup() override;
   void loop() override;

esphome/components/ld2420/ld2420.cpp

@@ -180,7 +180,7 @@ void LD2420Component::apply_config_action() {
 }
 
 void LD2420Component::factory_reset_action() {
-  ESP_LOGCONFIG(TAG, "Setiing factory defaults...");
+  ESP_LOGCONFIG(TAG, "Setting factory defaults...");
   if (this->set_config_mode(true) == LD2420_ERROR_TIMEOUT) {
     ESP_LOGE(TAG, "LD2420 module has failed to respond, check baud rate and serial connections.");
     this->mark_failed();

esphome/components/sdm_meter/sdm_meter.cpp

@@ -38,7 +38,7 @@ void SDMMeter::on_modbus_data(const std::vector<uint8_t> &data) {
 
     ESP_LOGD(
         TAG,
-        "SDMMeter Phase %c: V=%.3f V, I=%.3f A, Active P=%.3f W, Apparent P=%.3f VA, Reactive P=%.3f VAR, PF=%.3f, "
+        "SDMMeter Phase %c: V=%.3f V, I=%.3f A, Active P=%.3f W, Apparent P=%.3f VA, Reactive P=%.3f var, PF=%.3f, "
         "PA=%.3f °",
         i + 'A', voltage, current, active_power, apparent_power, reactive_power, power_factor, phase_angle);
     if (phase.voltage_sensor_ != nullptr)

esphome/components/tuya/fan/tuya_fan.cpp

@@ -86,7 +86,7 @@ void TuyaFan::control(const fan::FanCall &call) {
   if (this->oscillation_id_.has_value() && call.get_oscillating().has_value()) {
     if (this->oscillation_type_ == TuyaDatapointType::ENUM) {
       this->parent_->set_enum_datapoint_value(*this->oscillation_id_, *call.get_oscillating());
-    } else if (this->speed_type_ == TuyaDatapointType::BOOLEAN) {
+    } else if (this->oscillation_type_ == TuyaDatapointType::BOOLEAN) {
       this->parent_->set_boolean_datapoint_value(*this->oscillation_id_, *call.get_oscillating());
     }
   }

esphome/const.py

@@ -1095,7 +1095,7 @@ UNIT_STEPS = "steps"
 UNIT_VOLT = "V"
 UNIT_VOLT_AMPS = "VA"
 UNIT_VOLT_AMPS_HOURS = "VAh"
-UNIT_VOLT_AMPS_REACTIVE = "VAR"
+UNIT_VOLT_AMPS_REACTIVE = "var"
 UNIT_VOLT_AMPS_REACTIVE_HOURS = "VARh"
 UNIT_WATT = "W"
 UNIT_WATT_HOURS = "Wh"

requirements.txt

@@ -12,7 +12,7 @@ pyserial==3.5
 platformio==6.1.16  # When updating platformio, also update Dockerfile
 esptool==4.7.0
 click==8.1.7
-esphome-dashboard==20241025.0
+esphome-dashboard==20241118.0
 aioesphomeapi==24.6.2
 zeroconf==0.132.2
 puremagic==1.27

tests/components/esp32_ble_tracker/common.yaml

@@ -39,3 +39,10 @@ esp32_ble_tracker:
     - then:
         - lambda: |-
              ESP_LOGD("ble_auto", "The scan has ended!");
+
+wifi:
+  ssid: MySSID
+  password: password1
+
+ota:
+  - platform: esphome