Home-IoT/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2024-11-23 15:38:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Merge branch 'dev' into refactor_esp32camera

Browse source
This commit is contained in:
DT-art1 2024-11-14 07:14:36 +01:00 committed by GitHub
commit a5b213f9d3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp
View file

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

2
esphome/components/ld2420/ld2420.cpp
View file

@ -180,7 +180,7 @@ void LD2420Component::apply_config_action() {
} }
void LD2420Component::factory_reset_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) { if (this->set_config_mode(true) == LD2420_ERROR_TIMEOUT) {
ESP_LOGE(TAG, "LD2420 module has failed to respond, check baud rate and serial connections."); ESP_LOGE(TAG, "LD2420 module has failed to respond, check baud rate and serial connections.");
this->mark_failed(); this->mark_failed();

2
esphome/components/sdm_meter/sdm_meter.cpp
View file

@ -38,7 +38,7 @@ void SDMMeter::on_modbus_data(const std::vector<uint8_t> &data) {
ESP_LOGD( ESP_LOGD(
TAG, 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 °", "PA=%.3f °",
i + 'A', voltage, current, active_power, apparent_power, reactive_power, power_factor, phase_angle); i + 'A', voltage, current, active_power, apparent_power, reactive_power, power_factor, phase_angle);
if (phase.voltage_sensor_ != nullptr) if (phase.voltage_sensor_ != nullptr)

2
esphome/const.py
View file

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

7
tests/components/esp32_ble_tracker/common.yaml
View file

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