[pull] dev from home-assistant:dev

homeassistant/bootstrap.py

@@ -243,6 +243,7 @@
     # Integrations providing triggers and conditions for base platforms:
     "door",
     "garage_door",
+    "humidity",
 }
 DEFAULT_INTEGRATIONS_RECOVERY_MODE = {
     # These integrations are set up if recovery mode is activated.

homeassistant/components/adax/climate.py

@@ -168,29 +168,57 @@ async def async_set_hvac_mode(self, hvac_mode: HVACMode) -> None:
         if hvac_mode == HVACMode.HEAT:
             temperature = self._attr_target_temperature or self._attr_min_temp
             await self._adax_data_handler.set_target_temperature(temperature)
+            self._attr_target_temperature = temperature
+            self._attr_icon = "mdi:radiator"
         elif hvac_mode == HVACMode.OFF:
             await self._adax_data_handler.set_target_temperature(0)
+            self._attr_icon = "mdi:radiator-off"
+        else:
+            # Ignore unsupported HVAC modes to avoid desynchronizing entity state
+            # from the physical device.
+            return
+
+        self._attr_hvac_mode = hvac_mode
+        self.async_write_ha_state()
 
     async def async_set_temperature(self, **kwargs: Any) -> None:
         """Set new target temperature."""
         if (temperature := kwargs.get(ATTR_TEMPERATURE)) is None:
             return
-        await self._adax_data_handler.set_target_temperature(temperature)
+        if self._attr_hvac_mode == HVACMode.HEAT:
+            await self._adax_data_handler.set_target_temperature(temperature)
 
-    @callback
-    def _handle_coordinator_update(self) -> None:
-        """Handle updated data from the coordinator."""
+        self._attr_target_temperature = temperature
+        self.async_write_ha_state()
+
+    def _update_hvac_attributes(self) -> None:
+        """Update hvac mode and temperatures from coordinator data.
+
+        The coordinator reports a target temperature of 0 when the heater is
+        turned off. In that case, only the hvac mode and icon are updated and
+        the previous non-zero target temperature is preserved. When the
+        reported target temperature is non-zero, the stored target temperature
+        is updated to match the coordinator value.
+        """
         if data := self.coordinator.data:
             self._attr_current_temperature = data["current_temperature"]
-            self._attr_available = self._attr_current_temperature is not None
             if (target_temp := data["target_temperature"]) == 0:
                 self._attr_hvac_mode = HVACMode.OFF
                 self._attr_icon = "mdi:radiator-off"
-                if target_temp == 0:
+                if self._attr_target_temperature is None:
                     self._attr_target_temperature = self._attr_min_temp
             else:
                 self._attr_hvac_mode = HVACMode.HEAT
                 self._attr_icon = "mdi:radiator"
                 self._attr_target_temperature = target_temp
 
+    @callback
+    def _handle_coordinator_update(self) -> None:
+        """Handle updated data from the coordinator."""
+        self._update_hvac_attributes()
         super()._handle_coordinator_update()
+
+    async def async_added_to_hass(self) -> None:
+        """When entity is added to hass."""
+        await super().async_added_to_hass()
+        self._update_hvac_attributes()

homeassistant/components/automation/__init__.py

@@ -146,6 +146,7 @@
     "fan",
     "garage_door",
     "humidifier",
+    "humidity",
     "lawn_mower",
     "light",
     "lock",

homeassistant/components/climate/trigger.py

@@ -53,16 +53,16 @@ def __init__(self, hass: HomeAssistant, config: TriggerConfig) -> None:
         DOMAIN, ATTR_HVAC_ACTION, HVACAction.DRYING
     ),
     "target_humidity_changed": make_entity_numerical_state_attribute_changed_trigger(
-        DOMAIN, ATTR_HUMIDITY
+        {DOMAIN}, {DOMAIN: ATTR_HUMIDITY}
     ),
     "target_humidity_crossed_threshold": make_entity_numerical_state_attribute_crossed_threshold_trigger(
-        DOMAIN, ATTR_HUMIDITY
+        {DOMAIN}, {DOMAIN: ATTR_HUMIDITY}
     ),
     "target_temperature_changed": make_entity_numerical_state_attribute_changed_trigger(
-        DOMAIN, ATTR_TEMPERATURE
+        {DOMAIN}, {DOMAIN: ATTR_TEMPERATURE}
     ),
     "target_temperature_crossed_threshold": make_entity_numerical_state_attribute_crossed_threshold_trigger(
-        DOMAIN, ATTR_TEMPERATURE
+        {DOMAIN}, {DOMAIN: ATTR_TEMPERATURE}
     ),
     "turned_off": make_entity_target_state_trigger(DOMAIN, HVACMode.OFF),
     "turned_on": make_entity_transition_trigger(

homeassistant/components/cover/__init__.py

@@ -45,7 +45,7 @@
     CoverEntityFeature,
     CoverState,
 )
-from .trigger import CoverClosedTriggerBase, CoverOpenedTriggerBase
+from .trigger import make_cover_closed_trigger, make_cover_opened_trigger
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -74,13 +74,13 @@
     "INTENT_OPEN_COVER",
     "PLATFORM_SCHEMA",
     "PLATFORM_SCHEMA_BASE",
-    "CoverClosedTriggerBase",
     "CoverDeviceClass",
     "CoverEntity",
     "CoverEntityDescription",
     "CoverEntityFeature",
-    "CoverOpenedTriggerBase",
     "CoverState",
+    "make_cover_closed_trigger",
+    "make_cover_opened_trigger",
 ]
 
 

homeassistant/components/cover/icons.json

@@ -108,5 +108,37 @@
     "toggle_cover_tilt": {
       "service": "mdi:arrow-top-right-bottom-left"
     }
+  },
+  "triggers": {
+    "awning_closed": {
+      "trigger": "mdi:storefront-outline"
+    },
+    "awning_opened": {
+      "trigger": "mdi:storefront-outline"
+    },
+    "blind_closed": {
+      "trigger": "mdi:blinds-horizontal-closed"
+    },
+    "blind_opened": {
+      "trigger": "mdi:blinds-horizontal"
+    },
+    "curtain_closed": {
+      "trigger": "mdi:curtains-closed"
+    },
+    "curtain_opened": {
+      "trigger": "mdi:curtains"
+    },
+    "shade_closed": {
+      "trigger": "mdi:roller-shade-closed"
+    },
+    "shade_opened": {
+      "trigger": "mdi:roller-shade"
+    },
+    "shutter_closed": {
+      "trigger": "mdi:window-shutter"
+    },
+    "shutter_opened": {
+      "trigger": "mdi:window-shutter-open"
+    }
   }
 }

homeassistant/components/cover/strings.json

@@ -1,4 +1,8 @@
 {
+  "common": {
+    "trigger_behavior_description": "The behavior of the targeted covers to trigger on.",
+    "trigger_behavior_name": "Behavior"
+  },
   "device_automation": {
     "action_type": {
       "close": "Close {entity_name}",
@@ -82,6 +86,15 @@
       "name": "Window"
     }
   },
+  "selector": {
+    "trigger_behavior": {
+      "options": {
+        "any": "Any",
+        "first": "First",
+        "last": "Last"
+      }
+    }
+  },
   "services": {
     "close_cover": {
       "description": "Closes a cover.",
@@ -136,5 +149,107 @@
       "name": "Toggle tilt"
     }
   },
-  "title": "Cover"
+  "title": "Cover",
+  "triggers": {
+    "awning_closed": {
+      "description": "Triggers after one or more awnings close.",
+      "fields": {
+        "behavior": {
+          "description": "[%key:component::cover::common::trigger_behavior_description%]",
+          "name": "[%key:component::cover::common::trigger_behavior_name%]"
+        }
+      },
+      "name": "Awning closed"
+    },
+    "awning_opened": {
+      "description": "Triggers after one or more awnings open.",
+      "fields": {
+        "behavior": {
+          "description": "[%key:component::cover::common::trigger_behavior_description%]",
+          "name": "[%key:component::cover::common::trigger_behavior_name%]"
+        }
+      },
+      "name": "Awning opened"
+    },
+    "blind_closed": {
+      "description": "Triggers after one or more blinds close.",
+      "fields": {
+        "behavior": {
+          "description": "[%key:component::cover::common::trigger_behavior_description%]",
+          "name": "[%key:component::cover::common::trigger_behavior_name%]"
+        }
+      },
+      "name": "Blind closed"
+    },
+    "blind_opened": {
+      "description": "Triggers after one or more blinds open.",
+      "fields": {
+        "behavior": {
+          "description": "[%key:component::cover::common::trigger_behavior_description%]",
+          "name": "[%key:component::cover::common::trigger_behavior_name%]"
+        }
+      },
+      "name": "Blind opened"
+    },
+    "curtain_closed": {
+      "description": "Triggers after one or more curtains close.",
+      "fields": {
+        "behavior": {
+          "description": "[%key:component::cover::common::trigger_behavior_description%]",
+          "name": "[%key:component::cover::common::trigger_behavior_name%]"
+        }
+      },
+      "name": "Curtain closed"
+    },
+    "curtain_opened": {
+      "description": "Triggers after one or more curtains open.",
+      "fields": {
+        "behavior": {
+          "description": "[%key:component::cover::common::trigger_behavior_description%]",
+          "name": "[%key:component::cover::common::trigger_behavior_name%]"
+        }
+      },
+      "name": "Curtain opened"
+    },
+    "shade_closed": {
+      "description": "Triggers after one or more shades close.",
+      "fields": {
+        "behavior": {
+          "description": "[%key:component::cover::common::trigger_behavior_description%]",
+          "name": "[%key:component::cover::common::trigger_behavior_name%]"
+        }
+      },
+      "name": "Shade closed"
+    },
+    "shade_opened": {
+      "description": "Triggers after one or more shades open.",
+      "fields": {
+        "behavior": {
+          "description": "[%key:component::cover::common::trigger_behavior_description%]",
+          "name": "[%key:component::cover::common::trigger_behavior_name%]"
+        }
+      },
+      "name": "Shade opened"
+    },
+    "shutter_closed": {
+      "description": "Triggers after one or more shutters close.",
+      "fields": {
+        "behavior": {
+          "description": "[%key:component::cover::common::trigger_behavior_description%]",
+          "name": "[%key:component::cover::common::trigger_behavior_name%]"
+        }
+      },
+      "name": "Shutter closed"
+    },
+    "shutter_opened": {
+      "description": "Triggers after one or more shutters open.",
+      "fields": {
+        "behavior": {
+          "description": "[%key:component::cover::common::trigger_behavior_description%]",
+          "name": "[%key:component::cover::common::trigger_behavior_name%]"
+        }
+      },
+      "name": "Shutter opened"
+    }
+  }
 }