esphome 2025.6.2__py3-none-any.whl → 2025.7.0__py3-none-any.whl

esphome/components/sx127x/sx127x.h

@@ -0,0 +1,128 @@
+#pragma once
+
+#include "sx127x_reg.h"
+#include "esphome/components/spi/spi.h"
+#include "esphome/core/automation.h"
+#include "esphome/core/component.h"
+#include <vector>
+
+namespace esphome {
+namespace sx127x {
+
+enum SX127xBw : uint8_t {
+  SX127X_BW_2_6,
+  SX127X_BW_3_1,
+  SX127X_BW_3_9,
+  SX127X_BW_5_2,
+  SX127X_BW_6_3,
+  SX127X_BW_7_8,
+  SX127X_BW_10_4,
+  SX127X_BW_12_5,
+  SX127X_BW_15_6,
+  SX127X_BW_20_8,
+  SX127X_BW_25_0,
+  SX127X_BW_31_3,
+  SX127X_BW_41_7,
+  SX127X_BW_50_0,
+  SX127X_BW_62_5,
+  SX127X_BW_83_3,
+  SX127X_BW_100_0,
+  SX127X_BW_125_0,
+  SX127X_BW_166_7,
+  SX127X_BW_200_0,
+  SX127X_BW_250_0,
+  SX127X_BW_500_0,
+};
+
+enum class SX127xError { NONE = 0, TIMEOUT, INVALID_PARAMS };
+
+class SX127xListener {
+ public:
+  virtual void on_packet(const std::vector<uint8_t> &packet, float rssi, float snr) = 0;
+};
+
+class SX127x : public Component,
+               public spi::SPIDevice<spi::BIT_ORDER_MSB_FIRST, spi::CLOCK_POLARITY_LOW, spi::CLOCK_PHASE_LEADING,
+                                     spi::DATA_RATE_8MHZ> {
+ public:
+  size_t get_max_packet_size();
+  float get_setup_priority() const override { return setup_priority::PROCESSOR; }
+  void setup() override;
+  void loop() override;
+  void dump_config() override;
+  void set_auto_cal(bool auto_cal) { this->auto_cal_ = auto_cal; }
+  void set_bandwidth(SX127xBw bandwidth) { this->bandwidth_ = bandwidth; }
+  void set_bitrate(uint32_t bitrate) { this->bitrate_ = bitrate; }
+  void set_bitsync(bool bitsync) { this->bitsync_ = bitsync; }
+  void set_coding_rate(uint8_t coding_rate) { this->coding_rate_ = coding_rate; }
+  void set_crc_enable(bool crc_enable) { this->crc_enable_ = crc_enable; }
+  void set_deviation(uint32_t deviation) { this->deviation_ = deviation; }
+  void set_dio0_pin(InternalGPIOPin *dio0_pin) { this->dio0_pin_ = dio0_pin; }
+  void set_frequency(uint32_t frequency) { this->frequency_ = frequency; }
+  void set_mode_rx();
+  void set_mode_tx();
+  void set_mode_standby();
+  void set_mode_sleep();
+  void set_modulation(uint8_t modulation) { this->modulation_ = modulation; }
+  void set_pa_pin(uint8_t pin) { this->pa_pin_ = pin; }
+  void set_pa_power(uint8_t power) { this->pa_power_ = power; }
+  void set_pa_ramp(uint8_t ramp) { this->pa_ramp_ = ramp; }
+  void set_packet_mode(bool packet_mode) { this->packet_mode_ = packet_mode; }
+  void set_payload_length(uint8_t payload_length) { this->payload_length_ = payload_length; }
+  void set_preamble_errors(uint8_t preamble_errors) { this->preamble_errors_ = preamble_errors; }
+  void set_preamble_polarity(uint8_t preamble_polarity) { this->preamble_polarity_ = preamble_polarity; }
+  void set_preamble_size(uint16_t preamble_size) { this->preamble_size_ = preamble_size; }
+  void set_preamble_detect(uint8_t preamble_detect) { this->preamble_detect_ = preamble_detect; }
+  void set_rst_pin(InternalGPIOPin *rst_pin) { this->rst_pin_ = rst_pin; }
+  void set_rx_floor(float floor) { this->rx_floor_ = floor; }
+  void set_rx_start(bool start) { this->rx_start_ = start; }
+  void set_shaping(uint8_t shaping) { this->shaping_ = shaping; }
+  void set_spreading_factor(uint8_t spreading_factor) { this->spreading_factor_ = spreading_factor; }
+  void set_sync_value(const std::vector<uint8_t> &sync_value) { this->sync_value_ = sync_value; }
+  void run_image_cal();
+  void configure();
+  SX127xError transmit_packet(const std::vector<uint8_t> &packet);
+  void register_listener(SX127xListener *listener) { this->listeners_.push_back(listener); }
+  Trigger<std::vector<uint8_t>, float, float> *get_packet_trigger() const { return this->packet_trigger_; };
+
+ protected:
+  void configure_fsk_ook_();
+  void configure_lora_();
+  void set_mode_(uint8_t modulation, uint8_t mode);
+  void write_fifo_(const std::vector<uint8_t> &packet);
+  void read_fifo_(std::vector<uint8_t> &packet);
+  void write_register_(uint8_t reg, uint8_t value);
+  void call_listeners_(const std::vector<uint8_t> &packet, float rssi, float snr);
+  uint8_t read_register_(uint8_t reg);
+  Trigger<std::vector<uint8_t>, float, float> *packet_trigger_{new Trigger<std::vector<uint8_t>, float, float>()};
+  std::vector<SX127xListener *> listeners_;
+  std::vector<uint8_t> packet_;
+  std::vector<uint8_t> sync_value_;
+  InternalGPIOPin *dio0_pin_{nullptr};
+  InternalGPIOPin *rst_pin_{nullptr};
+  SX127xBw bandwidth_;
+  uint32_t bitrate_;
+  uint32_t deviation_;
+  uint32_t frequency_;
+  uint32_t payload_length_;
+  uint16_t preamble_size_;
+  uint8_t coding_rate_;
+  uint8_t modulation_;
+  uint8_t pa_pin_;
+  uint8_t pa_power_;
+  uint8_t pa_ramp_;
+  uint8_t preamble_detect_;
+  uint8_t preamble_errors_;
+  uint8_t preamble_polarity_;
+  uint8_t shaping_;
+  uint8_t spreading_factor_;
+  float rx_floor_;
+  bool auto_cal_{false};
+  bool bitsync_{false};
+  bool crc_enable_{false};
+  bool packet_mode_{false};
+  bool rx_start_{false};
+};
+
+}  // namespace sx127x
+}  // namespace esphome

esphome/components/sx127x/sx127x_reg.h

@@ -0,0 +1,295 @@
+#pragma once
+
+#include "esphome/core/hal.h"
+
+namespace esphome {
+namespace sx127x {
+
+enum SX127xReg : uint8_t {
+  // Common registers
+  REG_FIFO = 0x00,
+  REG_OP_MODE = 0x01,
+  REG_BITRATE_MSB = 0x02,
+  REG_BITRATE_LSB = 0x03,
+  REG_FDEV_MSB = 0x04,
+  REG_FDEV_LSB = 0x05,
+  REG_FRF_MSB = 0x06,
+  REG_FRF_MID = 0x07,
+  REG_FRF_LSB = 0x08,
+  REG_PA_CONFIG = 0x09,
+  REG_PA_RAMP = 0x0A,
+  REG_DIO_MAPPING1 = 0x40,
+  REG_DIO_MAPPING2 = 0x41,
+  REG_VERSION = 0x42,
+  // FSK/OOK registers
+  REG_RX_CONFIG = 0x0D,
+  REG_RSSI_THRESH = 0x10,
+  REG_RX_BW = 0x12,
+  REG_OOK_PEAK = 0x14,
+  REG_OOK_FIX = 0x15,
+  REG_OOK_AVG = 0x16,
+  REG_AFC_FEI = 0x1A,
+  REG_PREAMBLE_DETECT = 0x1F,
+  REG_PREAMBLE_SIZE_MSB = 0x25,
+  REG_PREAMBLE_SIZE_LSB = 0x26,
+  REG_SYNC_CONFIG = 0x27,
+  REG_SYNC_VALUE1 = 0x28,
+  REG_SYNC_VALUE2 = 0x29,
+  REG_SYNC_VALUE3 = 0x2A,
+  REG_SYNC_VALUE4 = 0x2B,
+  REG_SYNC_VALUE5 = 0x2C,
+  REG_SYNC_VALUE6 = 0x2D,
+  REG_SYNC_VALUE7 = 0x2E,
+  REG_SYNC_VALUE8 = 0x2F,
+  REG_PACKET_CONFIG_1 = 0x30,
+  REG_PACKET_CONFIG_2 = 0x31,
+  REG_PAYLOAD_LENGTH_LSB = 0x32,
+  REG_FIFO_THRESH = 0x35,
+  REG_IMAGE_CAL = 0x3B,
+  // LoRa registers
+  REG_FIFO_ADDR_PTR = 0x0D,
+  REG_FIFO_TX_BASE_ADDR = 0x0E,
+  REG_FIFO_RX_BASE_ADDR = 0x0F,
+  REG_FIFO_RX_CURR_ADDR = 0x10,
+  REG_IRQ_FLAGS_MASK = 0x11,
+  REG_IRQ_FLAGS = 0x12,
+  REG_NB_RX_BYTES = 0x13,
+  REG_MODEM_STAT = 0x18,
+  REG_PKT_SNR_VALUE = 0x19,
+  REG_PKT_RSSI_VALUE = 0x1A,
+  REG_RSSI_VALUE = 0x1B,
+  REG_HOP_CHANNEL = 0x1C,
+  REG_MODEM_CONFIG1 = 0x1D,
+  REG_MODEM_CONFIG2 = 0x1E,
+  REG_SYMB_TIMEOUT_LSB = 0x1F,
+  REG_PREAMBLE_LEN_MSB = 0x20,
+  REG_PREAMBLE_LEN_LSB = 0x21,
+  REG_PAYLOAD_LENGTH = 0x22,
+  REG_HOP_PERIOD = 0x24,
+  REG_FIFO_RX_BYTE_ADDR = 0x25,
+  REG_MODEM_CONFIG3 = 0x26,
+  REG_FEI_MSB = 0x28,
+  REG_FEI_MIB = 0x29,
+  REG_FEI_LSB = 0x2A,
+  REG_DETECT_OPTIMIZE = 0x31,
+  REG_INVERT_IQ = 0x33,
+  REG_DETECT_THRESHOLD = 0x37,
+  REG_SYNC_WORD = 0x39,
+};
+
+enum SX127xOpMode : uint8_t {
+  MOD_LORA = 0x80,
+  ACCESS_FSK_REGS = 0x40,
+  ACCESS_LORA_REGS = 0x00,
+  MOD_OOK = 0x20,
+  MOD_FSK = 0x00,
+  ACCESS_LF_REGS = 0x08,
+  ACCESS_HF_REGS = 0x00,
+  MODE_CAD = 0x07,
+  MODE_RX_SINGLE = 0x06,
+  MODE_RX = 0x05,
+  MODE_RX_FS = 0x04,
+  MODE_TX = 0x03,
+  MODE_TX_FS = 0x02,
+  MODE_STDBY = 0x01,
+  MODE_SLEEP = 0x00,
+  MODE_MASK = 0x07,
+};
+
+enum SX127xPaConfig : uint8_t {
+  PA_PIN_BOOST = 0x80,
+  PA_PIN_RFO = 0x00,
+  PA_MAX_POWER = 0x70,
+};
+
+enum SX127xPaRamp : uint8_t {
+  CUTOFF_BR_X_2 = 0x40,
+  CUTOFF_BR_X_1 = 0x20,
+  GAUSSIAN_BT_0_3 = 0x60,
+  GAUSSIAN_BT_0_5 = 0x40,
+  GAUSSIAN_BT_1_0 = 0x20,
+  SHAPING_NONE = 0x00,
+  PA_RAMP_10 = 0x0F,
+  PA_RAMP_12 = 0x0E,
+  PA_RAMP_15 = 0x0D,
+  PA_RAMP_20 = 0x0C,
+  PA_RAMP_25 = 0x0B,
+  PA_RAMP_31 = 0x0A,
+  PA_RAMP_40 = 0x09,
+  PA_RAMP_50 = 0x08,
+  PA_RAMP_62 = 0x07,
+  PA_RAMP_100 = 0x06,
+  PA_RAMP_125 = 0x05,
+  PA_RAMP_250 = 0x04,
+  PA_RAMP_500 = 0x03,
+  PA_RAMP_1000 = 0x02,
+  PA_RAMP_2000 = 0x01,
+  PA_RAMP_3400 = 0x00,
+};
+
+enum SX127xDioMapping1 : uint8_t {
+  DIO0_MAPPING_00 = 0x00,
+  DIO0_MAPPING_01 = 0x40,
+  DIO0_MAPPING_10 = 0x80,
+  DIO0_MAPPING_11 = 0xC0,
+};
+
+enum SX127xRxConfig : uint8_t {
+  RESTART_ON_COLLISION = 0x80,
+  RESTART_NO_LOCK = 0x40,
+  RESTART_PLL_LOCK = 0x20,
+  AFC_AUTO_ON = 0x10,
+  AGC_AUTO_ON = 0x08,
+  TRIGGER_NONE = 0x00,
+  TRIGGER_RSSI = 0x01,
+  TRIGGER_PREAMBLE = 0x06,
+  TRIGGER_ALL = 0x07,
+};
+
+enum SX127xRxBw : uint8_t {
+  RX_BW_2_6 = 0x17,
+  RX_BW_3_1 = 0x0F,
+  RX_BW_3_9 = 0x07,
+  RX_BW_5_2 = 0x16,
+  RX_BW_6_3 = 0x0E,
+  RX_BW_7_8 = 0x06,
+  RX_BW_10_4 = 0x15,
+  RX_BW_12_5 = 0x0D,
+  RX_BW_15_6 = 0x05,
+  RX_BW_20_8 = 0x14,
+  RX_BW_25_0 = 0x0C,
+  RX_BW_31_3 = 0x04,
+  RX_BW_41_7 = 0x13,
+  RX_BW_50_0 = 0x0B,
+  RX_BW_62_5 = 0x03,
+  RX_BW_83_3 = 0x12,
+  RX_BW_100_0 = 0x0A,
+  RX_BW_125_0 = 0x02,
+  RX_BW_166_7 = 0x11,
+  RX_BW_200_0 = 0x09,
+  RX_BW_250_0 = 0x01,
+};
+
+enum SX127xOokPeak : uint8_t {
+  BIT_SYNC_ON = 0x20,
+  BIT_SYNC_OFF = 0x00,
+  OOK_THRESH_AVG = 0x10,
+  OOK_THRESH_PEAK = 0x08,
+  OOK_THRESH_FIXED = 0x00,
+  OOK_THRESH_STEP_6_0 = 0x07,
+  OOK_THRESH_STEP_5_0 = 0x06,
+  OOK_THRESH_STEP_4_0 = 0x05,
+  OOK_THRESH_STEP_3_0 = 0x04,
+  OOK_THRESH_STEP_2_0 = 0x03,
+  OOK_THRESH_STEP_1_5 = 0x02,
+  OOK_THRESH_STEP_1_0 = 0x01,
+  OOK_THRESH_STEP_0_5 = 0x00,
+};
+
+enum SX127xOokAvg : uint8_t {
+  OOK_THRESH_DEC_16 = 0xE0,
+  OOK_THRESH_DEC_8 = 0xC0,
+  OOK_THRESH_DEC_4 = 0xA0,
+  OOK_THRESH_DEC_2 = 0x80,
+  OOK_THRESH_DEC_1_8 = 0x60,
+  OOK_THRESH_DEC_1_4 = 0x40,
+  OOK_THRESH_DEC_1_2 = 0x20,
+  OOK_THRESH_DEC_1 = 0x00,
+  OOK_AVG_RESERVED = 0x10,
+};
+
+enum SX127xAfcFei : uint8_t {
+  AFC_AUTO_CLEAR_ON = 0x01,
+};
+
+enum SX127xPreambleDetect : uint8_t {
+  PREAMBLE_DETECTOR_ON = 0x80,
+  PREAMBLE_DETECTOR_OFF = 0x00,
+  PREAMBLE_DETECTOR_SIZE_SHIFT = 5,
+  PREAMBLE_DETECTOR_TOL_SHIFT = 0,
+};
+
+enum SX127xSyncConfig : uint8_t {
+  AUTO_RESTART_PLL_LOCK = 0x80,
+  AUTO_RESTART_NO_LOCK = 0x40,
+  AUTO_RESTART_OFF = 0x00,
+  PREAMBLE_55 = 0x20,
+  PREAMBLE_AA = 0x00,
+  SYNC_ON = 0x10,
+  SYNC_OFF = 0x00,
+};
+
+enum SX127xPacketConfig1 : uint8_t {
+  VARIABLE_LENGTH = 0x80,
+  FIXED_LENGTH = 0x00,
+  CRC_ON = 0x10,
+  CRC_OFF = 0x00,
+};
+
+enum SX127xPacketConfig2 : uint8_t {
+  CONTINUOUS_MODE = 0x00,
+  PACKET_MODE = 0x40,
+};
+
+enum SX127xFifoThresh : uint8_t {
+  TX_START_FIFO_EMPTY = 0x80,
+  TX_START_FIFO_LEVEL = 0x00,
+};
+
+enum SX127xImageCal : uint8_t {
+  AUTO_IMAGE_CAL_ON = 0x80,
+  IMAGE_CAL_START = 0x40,
+  IMAGE_CAL_RUNNING = 0x20,
+  TEMP_CHANGE = 0x08,
+  TEMP_THRESHOLD_20C = 0x06,
+  TEMP_THRESHOLD_15C = 0x04,
+  TEMP_THRESHOLD_10C = 0x02,
+  TEMP_THRESHOLD_5C = 0x00,
+  TEMP_MONITOR_OFF = 0x01,
+  TEMP_MONITOR_ON = 0x00,
+};
+
+enum SX127xIrqFlags : uint8_t {
+  RX_TIMEOUT = 0x80,
+  RX_DONE = 0x40,
+  PAYLOAD_CRC_ERROR = 0x20,
+  VALID_HEADER = 0x10,
+  TX_DONE = 0x08,
+  CAD_DONE = 0x04,
+  FHSS_CHANGE_CHANNEL = 0x02,
+  CAD_DETECTED = 0x01,
+};
+
+enum SX127xModemCfg1 : uint8_t {
+  BW_7_8 = 0x00,
+  BW_10_4 = 0x10,
+  BW_15_6 = 0x20,
+  BW_20_8 = 0x30,
+  BW_31_3 = 0x40,
+  BW_41_7 = 0x50,
+  BW_62_5 = 0x60,
+  BW_125_0 = 0x70,
+  BW_250_0 = 0x80,
+  BW_500_0 = 0x90,
+  CODING_RATE_4_5 = 0x02,
+  CODING_RATE_4_6 = 0x04,
+  CODING_RATE_4_7 = 0x06,
+  CODING_RATE_4_8 = 0x08,
+  IMPLICIT_HEADER = 0x01,
+  EXPLICIT_HEADER = 0x00,
+};
+
+enum SX127xModemCfg2 : uint8_t {
+  SPREADING_FACTOR_SHIFT = 4,
+  TX_CONTINOUS_MODE = 0x08,
+  RX_PAYLOAD_CRC_ON = 0x04,
+  RX_PAYLOAD_CRC_OFF = 0x00,
+};
+
+enum SX127xModemCfg3 : uint8_t {
+  LOW_DATA_RATE_OPTIMIZE_ON = 0x08,
+  MODEM_AGC_AUTO_ON = 0x04,
+};
+
+}  // namespace sx127x
+}  // namespace esphome

esphome/components/syslog/esphome_syslog.cpp

@@ -21,10 +21,12 @@ constexpr int LOG_LEVEL_TO_SYSLOG_SEVERITY[] = {
 
 void Syslog::setup() {
   logger::global_logger->add_on_log_callback(
-      [this](int level, const char *tag, const char *message) { this->log_(level, tag, message); });
+      [this](int level, const char *tag, const char *message, size_t message_len) {
+        this->log_(level, tag, message, message_len);
+      });
 }
 
-void Syslog::log_(const int level, const char *tag, const char *message) const {
+void Syslog::log_(const int level, const char *tag, const char *message, size_t message_len) const {
   if (level > this->log_level_)
     return;
   // Syslog PRI calculation: facility * 8 + severity
@@ -34,7 +36,7 @@ void Syslog::log_(const int level, const char *tag, const char *message) const {
   }
   int pri = this->facility_ * 8 + severity;
   auto timestamp = this->time_->now().strftime("%b %d %H:%M:%S");
-  unsigned len = strlen(message);
+  size_t len = message_len;
   // remove color formatting
   if (this->strip_ && message[0] == 0x1B && len > 11) {
     message += 7;

esphome/components/syslog/esphome_syslog.h

@@ -17,7 +17,7 @@ class Syslog : public Component, public Parented<udp::UDPComponent> {
 
  protected:
   int log_level_;
-  void log_(int level, const char *tag, const char *message) const;
+  void log_(int level, const char *tag, const char *message, size_t message_len) const;
   time::RealTimeClock *time_;
   bool strip_{true};
   int facility_{16};

esphome/components/tca9555/__init__.py

@@ -53,7 +53,7 @@ TCA9555_PIN_SCHEMA = pins.gpio_base_schema(
     cv.int_range(min=0, max=15),
     modes=[CONF_INPUT, CONF_OUTPUT],
     mode_validator=validate_mode,
-    invertable=True,
+    invertible=True,
 ).extend(
     {
         cv.Required(CONF_TCA9555): cv.use_id(TCA9555Component),

esphome/components/template/binary_sensor/template_binary_sensor.cpp

@@ -6,16 +6,8 @@ namespace template_ {
 
 static const char *const TAG = "template.binary_sensor";
 
-void TemplateBinarySensor::setup() {
-  if (!this->publish_initial_state_)
-    return;
+void TemplateBinarySensor::setup() { this->loop(); }
 
-  if (this->f_ != nullptr) {
-    this->publish_initial_state(this->f_().value_or(false));
-  } else {
-    this->publish_initial_state(false);
-  }
-}
 void TemplateBinarySensor::loop() {
   if (this->f_ == nullptr)
     return;

esphome/components/text/__init__.py

@@ -14,8 +14,8 @@ from esphome.const import (
     CONF_WEB_SERVER,
 )
 from esphome.core import CORE, coroutine_with_priority
+from esphome.core.entity_helpers import entity_duplicate_validator, setup_entity
 from esphome.cpp_generator import MockObjClass
-from esphome.cpp_helpers import setup_entity
 
 CODEOWNERS = ["@mauritskorse"]
 IS_PLATFORM_COMPONENT = True
@@ -58,6 +58,9 @@ _TEXT_SCHEMA = (
 )
 
 
+_TEXT_SCHEMA.add_extra(entity_duplicate_validator("text"))
+
+
 def text_schema(
     class_: MockObjClass = cv.UNDEFINED,
     *,
@@ -94,7 +97,7 @@ async def setup_text_core_(
     max_length: int | None,
     pattern: str | None,
 ):
-    await setup_entity(var, config)
+    await setup_entity(var, config, "text")
 
     cg.add(var.traits.set_min_length(min_length))
     cg.add(var.traits.set_max_length(max_length))

esphome/components/text_sensor/__init__.py

@@ -21,8 +21,8 @@ from esphome.const import (
     DEVICE_CLASS_TIMESTAMP,
 )
 from esphome.core import CORE, coroutine_with_priority
+from esphome.core.entity_helpers import entity_duplicate_validator, setup_entity
 from esphome.cpp_generator import MockObjClass
-from esphome.cpp_helpers import setup_entity
 from esphome.util import Registry
 
 DEVICE_CLASSES = [
@@ -153,6 +153,9 @@ _TEXT_SENSOR_SCHEMA = (
 )
 
 
+_TEXT_SENSOR_SCHEMA.add_extra(entity_duplicate_validator("text_sensor"))
+
+
 def text_sensor_schema(
     class_: MockObjClass = cv.UNDEFINED,
     *,
@@ -186,7 +189,7 @@ async def build_filters(config):
 
 
 async def setup_text_sensor_core_(var, config):
-    await setup_entity(var, config)
+    await setup_entity(var, config, "text_sensor")
 
     if (device_class := config.get(CONF_DEVICE_CLASS)) is not None:
         cg.add(var.set_device_class(device_class))

esphome/components/thermostat/thermostat_climate.cpp

@@ -997,7 +997,7 @@ void ThermostatClimate::change_preset_(climate::ClimatePreset preset) {
   auto config = this->preset_config_.find(preset);
 
   if (config != this->preset_config_.end()) {
-    ESP_LOGI(TAG, "Preset %s requested", LOG_STR_ARG(climate::climate_preset_to_string(preset)));
+    ESP_LOGV(TAG, "Preset %s requested", LOG_STR_ARG(climate::climate_preset_to_string(preset)));
     if (this->change_preset_internal_(config->second) || (!this->preset.has_value()) ||
         this->preset.value() != preset) {
       // Fire any preset changed trigger if defined
@@ -1015,7 +1015,7 @@ void ThermostatClimate::change_preset_(climate::ClimatePreset preset) {
     this->custom_preset.reset();
     this->preset = preset;
   } else {
-    ESP_LOGE(TAG, "Preset %s is not configured, ignoring.", LOG_STR_ARG(climate::climate_preset_to_string(preset)));
+    ESP_LOGW(TAG, "Preset %s not configured; ignoring", LOG_STR_ARG(climate::climate_preset_to_string(preset)));
   }
 }
 
@@ -1023,7 +1023,7 @@ void ThermostatClimate::change_custom_preset_(const std::string &custom_preset)
   auto config = this->custom_preset_config_.find(custom_preset);
 
   if (config != this->custom_preset_config_.end()) {
-    ESP_LOGI(TAG, "Custom preset %s requested", custom_preset.c_str());
+    ESP_LOGV(TAG, "Custom preset %s requested", custom_preset.c_str());
     if (this->change_preset_internal_(config->second) || (!this->custom_preset.has_value()) ||
         this->custom_preset.value() != custom_preset) {
       // Fire any preset changed trigger if defined
@@ -1041,7 +1041,7 @@ void ThermostatClimate::change_custom_preset_(const std::string &custom_preset)
     this->preset.reset();
     this->custom_preset = custom_preset;
   } else {
-    ESP_LOGE(TAG, "Custom Preset %s is not configured, ignoring.", custom_preset.c_str());
+    ESP_LOGW(TAG, "Custom preset %s not configured; ignoring", custom_preset.c_str());
   }
 }
 
@@ -1298,7 +1298,7 @@ void ThermostatClimate::dump_config() {
   if (this->supports_two_points_) {
     ESP_LOGCONFIG(TAG, "  Minimum Set Point Differential: %.1f°C", this->set_point_minimum_differential_);
   }
-  ESP_LOGCONFIG(TAG, "  Start-up Delay Enabled: %s", YESNO(this->use_startup_delay_));
+  ESP_LOGCONFIG(TAG, "  Use Start-up Delay: %s", YESNO(this->use_startup_delay_));
   if (this->supports_cool_) {
     ESP_LOGCONFIG(TAG,
                   "  Cooling Parameters:\n"
@@ -1353,44 +1353,47 @@ void ThermostatClimate::dump_config() {
   }
   ESP_LOGCONFIG(TAG, "  Minimum Idle Time: %" PRIu32 "s", this->timer_[thermostat::TIMER_IDLE_ON].time / 1000);
   ESP_LOGCONFIG(TAG,
-                "  Supports AUTO: %s\n"
-                "  Supports HEAT/COOL: %s\n"
-                "  Supports COOL: %s\n"
-                "  Supports DRY: %s\n"
-                "  Supports FAN_ONLY: %s\n"
-                "  Supports FAN_ONLY_ACTION_USES_FAN_MODE_TIMER: %s\n"
-                "  Supports FAN_ONLY_COOLING: %s",
-                YESNO(this->supports_auto_), YESNO(this->supports_heat_cool_), YESNO(this->supports_cool_),
-                YESNO(this->supports_dry_), YESNO(this->supports_fan_only_),
+                "  Supported MODES:\n"
+                "    AUTO: %s\n"
+                "    HEAT/COOL: %s\n"
+                "    HEAT: %s\n"
+                "    COOL: %s\n"
+                "    DRY: %s\n"
+                "    FAN_ONLY: %s\n"
+                "    FAN_ONLY_ACTION_USES_FAN_MODE_TIMER: %s\n"
+                "    FAN_ONLY_COOLING: %s",
+                YESNO(this->supports_auto_), YESNO(this->supports_heat_cool_), YESNO(this->supports_heat_),
+                YESNO(this->supports_cool_), YESNO(this->supports_dry_), YESNO(this->supports_fan_only_),
                 YESNO(this->supports_fan_only_action_uses_fan_mode_timer_), YESNO(this->supports_fan_only_cooling_));
   if (this->supports_cool_) {
-    ESP_LOGCONFIG(TAG, "  Supports FAN_WITH_COOLING: %s", YESNO(this->supports_fan_with_cooling_));
+    ESP_LOGCONFIG(TAG, "    FAN_WITH_COOLING: %s", YESNO(this->supports_fan_with_cooling_));
   }
   if (this->supports_heat_) {
-    ESP_LOGCONFIG(TAG, "  Supports FAN_WITH_HEATING: %s", YESNO(this->supports_fan_with_heating_));
+    ESP_LOGCONFIG(TAG, "    FAN_WITH_HEATING: %s", YESNO(this->supports_fan_with_heating_));
   }
-  ESP_LOGCONFIG(TAG, "  Supports HEAT: %s", YESNO(this->supports_heat_));
   ESP_LOGCONFIG(TAG,
-                "  Supports FAN MODE ON: %s\n"
-                "  Supports FAN MODE OFF: %s\n"
-                "  Supports FAN MODE AUTO: %s\n"
-                "  Supports FAN MODE LOW: %s\n"
-                "  Supports FAN MODE MEDIUM: %s\n"
-                "  Supports FAN MODE HIGH: %s\n"
-                "  Supports FAN MODE MIDDLE: %s\n"
-                "  Supports FAN MODE FOCUS: %s\n"
-                "  Supports FAN MODE DIFFUSE: %s\n"
-                "  Supports FAN MODE QUIET: %s",
+                "  Supported FAN MODES:\n"
+                "    ON: %s\n"
+                "    OFF: %s\n"
+                "    AUTO: %s\n"
+                "    LOW: %s\n"
+                "    MEDIUM: %s\n"
+                "    HIGH: %s\n"
+                "    MIDDLE: %s\n"
+                "    FOCUS: %s\n"
+                "    DIFFUSE: %s\n"
+                "    QUIET: %s",
                 YESNO(this->supports_fan_mode_on_), YESNO(this->supports_fan_mode_off_),
                 YESNO(this->supports_fan_mode_auto_), YESNO(this->supports_fan_mode_low_),
                 YESNO(this->supports_fan_mode_medium_), YESNO(this->supports_fan_mode_high_),
                 YESNO(this->supports_fan_mode_middle_), YESNO(this->supports_fan_mode_focus_),
                 YESNO(this->supports_fan_mode_diffuse_), YESNO(this->supports_fan_mode_quiet_));
   ESP_LOGCONFIG(TAG,
-                "  Supports SWING MODE BOTH: %s\n"
-                "  Supports SWING MODE OFF: %s\n"
-                "  Supports SWING MODE HORIZONTAL: %s\n"
-                "  Supports SWING MODE VERTICAL: %s\n"
+                "  Supported SWING MODES:\n"
+                "    BOTH: %s\n"
+                "    OFF: %s\n"
+                "    HORIZONTAL: %s\n"
+                "    VERTICAL: %s\n"
                 "  Supports TWO SET POINTS: %s",
                 YESNO(this->supports_swing_mode_both_), YESNO(this->supports_swing_mode_off_),
                 YESNO(this->supports_swing_mode_horizontal_), YESNO(this->supports_swing_mode_vertical_),