Merge branch 'dev' into features/dfrobot_sn0395/targets-tracking

2024-11-23 23:48:11 +01:00 · 2024-06-24 10:53:18 +02:00 · 2024-06-24 10:53:18 +02:00 · 0e000a3164
commit 0e000a3164
parent 43638734e7 f7af51b92c
13 changed files with 20 additions and 44 deletions
--- a/esphome/components/haier/binary_sensor/init.py
+++ b/esphome/components/haier/binary_sensor/init.py
@ -56,7 +56,7 @@ SENSOR_TYPES = {

 CONFIG_SCHEMA = cv.Schema(
    {
-        cv.Required(CONF_HAIER_ID): cv.use_id(HonClimate),
+        cv.GenerateID(CONF_HAIER_ID): cv.use_id(HonClimate),
    }
 ).extend({cv.Optional(type): schema for type, schema in SENSOR_TYPES.items()})

@ -64,8 +64,8 @@ CONFIG_SCHEMA = cv.Schema(
 async def to_code(config):
    paren = await cg.get_variable(config[CONF_HAIER_ID])

-    for type, _ in SENSOR_TYPES.items():
-        if conf := config.get(type):
+    for type_ in SENSOR_TYPES:
+        if conf := config.get(type_):
            sens = await binary_sensor.new_binary_sensor(conf)
-            binary_sensor_type = getattr(BinarySensorTypeEnum, type.upper())
+            binary_sensor_type = getattr(BinarySensorTypeEnum, type_.upper())
            cg.add(paren.set_sub_binary_sensor(binary_sensor_type, sens))
--- a/esphome/components/haier/button/init.py
+++ b/esphome/components/haier/button/init.py
@ -21,7 +21,7 @@ ICON_SPRAY_BOTTLE = "mdi:spray-bottle"

 CONFIG_SCHEMA = cv.Schema(
    {
-        cv.Required(CONF_HAIER_ID): cv.use_id(HonClimate),
+        cv.GenerateID(CONF_HAIER_ID): cv.use_id(HonClimate),
        cv.Optional(CONF_SELF_CLEANING): button.button_schema(
            SelfCleaningButton,
            icon=ICON_SPRAY_BOTTLE,
--- a/esphome/components/haier/climate.py
+++ b/esphome/components/haier/climate.py
@ -183,7 +183,6 @@ BASE_CONFIG_SCHEMA = (
            cv.Optional(
                CONF_SUPPORTED_SWING_MODES,
                default=[
-                    "OFF",
                    "VERTICAL",
                    "HORIZONTAL",
                    "BOTH",
@ -211,7 +210,7 @@ CONFIG_SCHEMA = cv.All(
                    ): cv.boolean,
                    cv.Optional(
                        CONF_SUPPORTED_PRESETS,
-                        default=list(["BOOST", "COMFORT"]),  # No AWAY by default
+                        default=["BOOST", "COMFORT"],  # No AWAY by default
                    ): cv.ensure_list(
                        cv.enum(SUPPORTED_CLIMATE_PRESETS_SMARTAIR2_OPTIONS, upper=True)
                    ),
@ -231,7 +230,7 @@ CONFIG_SCHEMA = cv.All(
                    ): cv.int_range(min=PROTOCOL_CONTROL_PACKET_SIZE, max=50),
                    cv.Optional(
                        CONF_SUPPORTED_PRESETS,
-                        default=list(["BOOST", "ECO", "SLEEP"]),  # No AWAY by default
+                        default=["BOOST", "ECO", "SLEEP"],  # No AWAY by default
                    ): cv.ensure_list(
                        cv.enum(SUPPORTED_CLIMATE_PRESETS_HON_OPTIONS, upper=True)
                    ),
@ -427,11 +426,7 @@ def _final_validate(config):
            "No logger component found, logging for Haier protocol is disabled"
        )
        cg.add_build_flag("-DHAIER_LOG_LEVEL=0")
-    if (
-        (CONF_WIFI_SIGNAL in config)
-        and (config[CONF_WIFI_SIGNAL])
-        and CONF_WIFI not in full_config
-    ):
+    if config.get(CONF_WIFI_SIGNAL) and CONF_WIFI not in full_config:
        raise cv.Invalid(
            f"No WiFi configured, if you want to use haier climate without WiFi add {CONF_WIFI_SIGNAL}: false to climate configuration"
        )
--- a/esphome/components/haier/sensor/init.py
+++ b/esphome/components/haier/sensor/init.py
@ -137,16 +137,16 @@ SENSOR_TYPES = {

 CONFIG_SCHEMA = cv.Schema(
    {
-        cv.Required(CONF_HAIER_ID): cv.use_id(HonClimate),
+        cv.GenerateID(CONF_HAIER_ID): cv.use_id(HonClimate),
    }
-).extend({cv.Optional(type): schema for type, schema in SENSOR_TYPES.items()})
+).extend({cv.Optional(type_): schema for type_, schema in SENSOR_TYPES.items()})


 async def to_code(config):
    paren = await cg.get_variable(config[CONF_HAIER_ID])

-    for type, _ in SENSOR_TYPES.items():
-        if conf := config.get(type):
+    for type_ in SENSOR_TYPES:
+        if conf := config.get(type_):
            sens = await sensor.new_sensor(conf)
-            sensor_type = getattr(SensorTypeEnum, type.upper())
+            sensor_type = getattr(SensorTypeEnum, type_.upper())
            cg.add(paren.set_sub_sensor(sensor_type, sens))
--- a/esphome/components/haier/text_sensor/init.py
+++ b/esphome/components/haier/text_sensor/init.py
@ -39,7 +39,7 @@ TEXT_SENSOR_TYPES = {

 CONFIG_SCHEMA = cv.Schema(
    {
-        cv.Required(CONF_HAIER_ID): cv.use_id(HonClimate),
+        cv.GenerateID(CONF_HAIER_ID): cv.use_id(HonClimate),
    }
 ).extend({cv.Optional(type): schema for type, schema in TEXT_SENSOR_TYPES.items()})

@ -47,8 +47,8 @@ CONFIG_SCHEMA = cv.Schema(
 async def to_code(config):
    paren = await cg.get_variable(config[CONF_HAIER_ID])

-    for type, _ in TEXT_SENSOR_TYPES.items():
-        if conf := config.get(type):
+    for type_ in TEXT_SENSOR_TYPES:
+        if conf := config.get(type_):
            sens = await text_sensor.new_text_sensor(conf)
-            text_sensor_type = getattr(TextSensorTypeEnum, type.upper())
+            text_sensor_type = getattr(TextSensorTypeEnum, type_.upper())
            cg.add(paren.set_sub_text_sensor(text_sensor_type, sens))
--- a/esphome/components/http_request/http_request.h
+++ b/esphome/components/http_request/http_request.h
@ -149,6 +149,7 @@ template<typename... Ts> class HttpRequestSendAction : public Action<Ts...> {
        }
        response_body.reserve(read_index);
        response_body.assign((char *) buf, read_index);
+        allocator.deallocate(buf, max_length);
      }
    }

--- a/esphome/components/script/init.py
+++ b/esphome/components/script/init.py
@ -88,7 +88,7 @@ def validate_parameter_name(value):
    raise cv.Invalid(f"Script's parameter name cannot be {CONF_ID}")


-ALLOWED_PARAM_TYPE_CHARSET = set("abcdefghijklmnopqrstuvwxyz0123456789_:*&[]")
+ALLOWED_PARAM_TYPE_CHARSET = set("abcdefghijklmnopqrstuvwxyz0123456789_:*&[]<>")


 def validate_parameter_type(value):
--- a/esphome/components/update/init.py
+++ b/esphome/components/update/init.py
@ -69,7 +69,7 @@ async def setup_update_core_(var, config):
        await mqtt.register_mqtt_component(mqtt_, config)

    if web_server_id_config := config.get(CONF_WEB_SERVER_ID):
-        web_server_ = cg.get_variable(web_server_id_config)
+        web_server_ = await cg.get_variable(web_server_id_config)
        web_server.add_entity_to_sorting_list(web_server_, var, config)


--- a/tests/components/haier/test.esp32-c3-ard.yaml
+++ b/tests/components/haier/test.esp32-c3-ard.yaml
@ -54,7 +54,6 @@ climate:

 sensor:
  - platform: haier
-    haier_id: haier_ac
    outdoor_temperature:
      name: Haier outdoor temperature
    humidity:
@ -80,7 +79,6 @@ sensor:

 binary_sensor:
  - platform: haier
-    haier_id: haier_ac
    compressor_status:
      name: Haier Outdoor Compressor Status
    defrost_status:
@ -96,7 +94,6 @@ binary_sensor:

 button:
  - platform: haier
-    haier_id: haier_ac
    self_cleaning:
      name: Haier start self cleaning
    steri_cleaning:
@ -104,7 +101,6 @@ button:

 text_sensor:
  - platform: haier
-    haier_id: haier_ac
    appliance_name:
      name: Haier appliance name
    cleaning_status:
--- a/tests/components/haier/test.esp32-c3-idf.yaml
+++ b/tests/components/haier/test.esp32-c3-idf.yaml
@ -54,7 +54,6 @@ climate:

 sensor:
  - platform: haier
-    haier_id: haier_ac
    outdoor_temperature:
      name: Haier outdoor temperature
    humidity:
@ -80,7 +79,6 @@ sensor:

 binary_sensor:
  - platform: haier
-    haier_id: haier_ac
    compressor_status:
      name: Haier Outdoor Compressor Status
    defrost_status:
@ -96,7 +94,6 @@ binary_sensor:

 button:
  - platform: haier
-    haier_id: haier_ac
    self_cleaning:
      name: Haier start self cleaning
    steri_cleaning:
@ -104,7 +101,6 @@ button:

 text_sensor:
  - platform: haier
-    haier_id: haier_ac
    appliance_name:
      name: Haier appliance name
    cleaning_status:
--- a/tests/components/haier/test.esp32-idf.yaml
+++ b/tests/components/haier/test.esp32-idf.yaml
@ -54,7 +54,6 @@ climate:

 sensor:
  - platform: haier
-    haier_id: haier_ac
    outdoor_temperature:
      name: Haier outdoor temperature
    humidity:
@ -80,7 +79,6 @@ sensor:

 binary_sensor:
  - platform: haier
-    haier_id: haier_ac
    compressor_status:
      name: Haier Outdoor Compressor Status
    defrost_status:
@ -96,7 +94,6 @@ binary_sensor:

 button:
  - platform: haier
-    haier_id: haier_ac
    self_cleaning:
      name: Haier start self cleaning
    steri_cleaning:
@ -104,7 +101,6 @@ button:

 text_sensor:
  - platform: haier
-    haier_id: haier_ac
    appliance_name:
      name: Haier appliance name
    cleaning_status:
--- a/tests/components/haier/test.esp8266-ard.yaml
+++ b/tests/components/haier/test.esp8266-ard.yaml
@ -54,7 +54,6 @@ climate:

 sensor:
  - platform: haier
-    haier_id: haier_ac
    outdoor_temperature:
      name: Haier outdoor temperature
    humidity:
@ -80,7 +79,6 @@ sensor:

 binary_sensor:
  - platform: haier
-    haier_id: haier_ac
    compressor_status:
      name: Haier Outdoor Compressor Status
    defrost_status:
@ -96,7 +94,6 @@ binary_sensor:

 button:
  - platform: haier
-    haier_id: haier_ac
    self_cleaning:
      name: Haier start self cleaning
    steri_cleaning:
@ -104,7 +101,6 @@ button:

 text_sensor:
  - platform: haier
-    haier_id: haier_ac
    appliance_name:
      name: Haier appliance name
    cleaning_status:
--- a/tests/components/haier/test.rp2040-ard.yaml
+++ b/tests/components/haier/test.rp2040-ard.yaml
@ -54,7 +54,6 @@ climate:

 sensor:
  - platform: haier
-    haier_id: haier_ac
    outdoor_temperature:
      name: Haier outdoor temperature
    humidity:
@ -80,7 +79,6 @@ sensor:

 binary_sensor:
  - platform: haier
-    haier_id: haier_ac
    compressor_status:
      name: Haier Outdoor Compressor Status
    defrost_status:
@ -96,7 +94,6 @@ binary_sensor:

 button:
  - platform: haier
-    haier_id: haier_ac
    self_cleaning:
      name: Haier start self cleaning
    steri_cleaning:
@ -104,7 +101,6 @@ button:

 text_sensor:
  - platform: haier
-    haier_id: haier_ac
    appliance_name:
      name: Haier appliance name
    cleaning_status: