Merge branch 'next' into rc

source/_docs/blueprint/selectors.markdown

@@ -21,7 +21,9 @@ The following selectors are currently available:
 - [Device selector](#device-selector)
 - [Entity selector](#entity-selector)
 - [Number selector](#number-selector)
+- [Object selector](#object-selector)
 - [Target selector](#target-selector)
+- [Text selector](#text-selector)
 - [Time selector](#time-selector)
 
 If no selector is defined, a text input for a single line will be shown.
@@ -367,6 +369,18 @@ number:
   mode: slider
 ```
 
+## Object selector
+
+The object selector can be used to input arbitrary data in YAML form. This is useful for e.g. lists and dictionaries like service data. The value of the input will contain the provided data.
+
+![Screenshot of an object selector](/images/blueprints/selector-object.png)
+
+This selector does not have any other options; therefore, it only has its key.
+
+```yaml
+object:
+```
+
 ## Target selector
 
 The target selector is a rather special selector, allowing the user to selector
@@ -477,6 +491,26 @@ target:
     model: TRADFRI remote control
 ```
 
+## Text selector
+
+The text selector can be used to input a text string. The value of the input will contain the selected text.
+
+![Screenshot of a text selector](/images/blueprints/selector-text.png)
+
+Unless `multiline` is set to `true`, this selector behaves exactly like if no selector at all was specified, and will display a single line text input box on the user interface.
+
+```yaml
+text:
+```
+
+{% configuration text %}
+multiline:
+  description: Set to true to display the input as a multi-line text box on the user interface.
+  type: boolean
+  default: false
+  required: false
+{% endconfiguration %}
+
 ## Time selector
 
 The time selector shows a time input that allows the user to specify a time

source/_faq/unique_id.markdown

@@ -4,10 +4,36 @@ description: "This entity does not have a unique ID?"
 ha_category: Configuration
 ---
 
-When you see
+If you try to access the configuration dialog for an entity in your Home Assistant, you might end up seeing this message:
 
-```text
+![Screenshot of popup for no unique ID](/images/faq/faq_no_unique_id.jpg)
-This entity does not have a unique ID, therefore its settings cannot be managed from the UI
-```
 
-this simply means that you can't change the `entity_id` or the friendly name from the UI. You can still use the _Customizations_ menu to customize that entity. Typically you'll see this when you create entities using YAML.
+This means that this entity does not have a unique identification, e.g., a serial number or another identifier that is guaranteed to be static and never changes. As a result, the normal editing process that allows you to change various settings through the user interface (such as the entity ID, icon, friendly name, etc.) is not possible here.
+
+Typically, you'll see this when you create entities manually using YAML, but it can also appear if the integration that provides this entity, cannot determine a unique ID. This however is not an error, but just a limitation of the integration you use. A few selected integrations (such as [`template`](/integrations/template/) and [`mqtt`](/integrations/mqtt/)) allow the user to define a unique ID.
+
+### Used where?
+
+**Unique ID:**
+
+- Only internally in Home Assistant.
+
+**Entity ID:**
+
+- Entity with a unique ID: Entity ID only used as a reference, e.g., in automations or dashboards.
+- Entity without a unique ID: Entity ID acts as the replacement for the non-existing unique ID plus as a reference, e.g., in automations or dashboards.
+
+### Can be changed?
+
+**Unique ID:**
+
+- No. It is a static identifier.
+
+**Entity ID:**
+
+- Entity with a unique ID: Entity ID can be adjusted freely (as long as it follows the format `<domain>.<id>` and does not result in duplicates in your Home Assistant). Keep in mind that if you change the entity ID, you also need to update the references, e.g., in automations and dashboards.<br>
+- Entity without a unique ID: Entity ID is considered a fixed, static identifier and cannot be changed.
+
+If your user profile has the "Advanced Mode" activated, you will also see the second paragraph in the popup with a link to the [customization user interface](/docs/configuration/customizing-devices/#customization-using-the-ui) for this specific entity, which offers some customization options.
+
+In case you want to read more about unique IDs, head over to this [developer documentation page](/docs/entity_registry_index/).

source/_integrations/comfoconnect.markdown

@@ -64,6 +64,7 @@ sensor:
       - air_flow_supply
       - bypass_state
       - current_humidity
+      - current_rmot
       - current_temperature
       - days_to_replace_filter
       - exhaust_fan_duty
@@ -72,7 +73,9 @@ sensor:
       - exhaust_temperature
       - outside_humidity
       - outside_temperature
+      - power_total
       - power_usage
+      - preheater_power_total
       - preheater_power_usage
       - supply_fan_duty
       - supply_fan_speed

source/_integrations/foscam.markdown

@@ -34,6 +34,15 @@ If your Foscam camera supports PTZ, you will be able to pan or tilt your camera.
 | `movement` | 	Direction of the movement. Allowed values: `up`, `down`, `left`, `right`, `top_left`, `top_right`, `bottom_left`, `bottom_right` |
 | `travel_time` | (Optional) Travel time in seconds. Allowed values: float from 0 to 1. Default: 0.125 |
 
+### Service `foscam.ptz_preset`
+
+If your Foscam camera supports PTZ presets, you will be able to move the camera to a predefined preset using the preset name.
+
+| Service data attribute | Description |
+| -----------------------| ----------- |
+| `entity_id` | String or list of strings that point at `entity_id`s of cameras. Use `entity_id: all` to target all. |
+| `preset_name` | The name of the preset to move to. Presets can be created from within the official Foscam apps. |
+
 ### Example card with controls
 
 <p class='img'>

source/_integrations/huisbaasje.markdown

@@ -0,0 +1,35 @@
+---
+title: Huisbaasje
+description: Instructions on how to integrate Huisbaasje with Home Assistant.
+ha_category:
+  - Sensor
+  - Energy
+ha_release: 2021.2
+ha_iot_class: Cloud Polling
+ha_config_flow: true
+ha_codeowners:
+  - '@denniss17'
+ha_domain: huisbaasje
+---
+
+The Huisbaasje integrations allows you to track your energy consumption collected
+by the monitoring device installed on your energy meters.
+
+## Configuration
+
+Menu: **Configuration** -> **Integrations**.
+
+Click on the `+` sign to add an integration and click on **Huisbaasje**.
+Log in using your Huisbaasje account. After finishing, the Huisbaasje integration
+will be available.
+
+## Sensors
+
+This integration provides the following sensors:
+
+- Current power usage
+- Current power consumption from the grid, for both normal and off-peak time periods.
+- Current power return to the grid, for both normal and off-peak time periods.
+- Total energy used today
+- Current gas usage
+- Total gas used today

source/_integrations/qnap.markdown

@@ -126,6 +126,7 @@ This integration has been tested on the following devices:
 
 - TS-231P2 (QTS 4.4.2)
 - TS-259 Pro+ (QTS 4.2.6)
+- TS-228 (QTS 4.3.6)
 - TS-410 (QTS 4.2.3)
 - TS-419 (QTS 4.2.3)
 - TS-451 (QTS 4.2.2)

source/_lovelace/gauge.markdown

@@ -7,7 +7,7 @@ description: "The Gauge card is a basic card that allows visually seeing sensor
 The Gauge card is a basic card that allows visually seeing sensor data.
 
 <p class='img'>
-<img src='/images/lovelace/lovelace_gauge_card.gif' alt='Screenshot of the gauge card'>
+<img src='/images/lovelace/lovelace_gauge_card.gif' alt='Screenshot of the Gauge card'>
 Screenshot of the Gauge card.
 </p>
 
@@ -38,7 +38,12 @@ unit:
   required: false
   description: Unit of measurement given to data.
   type: string
-  default: Unit of measurement given by entity.
+  default: Unit of measurement given by entity
+icon:
+  required: false
+  description: Overwrites icon.
+  type: string
+  default: Entity domain icon
 theme:
   required: false
   description: Override the used theme for this card with any loaded theme. For more information about themes, see the [frontend documentation](/integrations/frontend/).

source/_lovelace/weather-forecast.markdown

@@ -68,6 +68,18 @@ theme:
   required: false
   description: Override the used theme for this card with any loaded theme. For more information about themes, see the [frontend documentation](/integrations/frontend/).
   type: string
+tap_action:
+  required: false
+  description: The action taken on card tap. For more information, see the [action documentation](/lovelace/actions/#tap-action).
+  type: map
+hold_action:
+  required: false
+  description: The action taken on card tap and hold. For more information, see the [action documentation](/lovelace/actions/#hold-action).
+  type: map
+double_tap_action:
+  required: false
+  description: The action taken on card double-tap. For more information, see the [action documentation](/lovelace/actions/#double-tap-action).
+  type: map
 {% endconfiguration %}
 
 Example