diff --git a/source/_docs/mqtt/discovery.markdown b/source/_docs/mqtt/discovery.markdown
index b5f9b00c127..b0247eeaa4d 100644
--- a/source/_docs/mqtt/discovery.markdown
+++ b/source/_docs/mqtt/discovery.markdown
@@ -303,6 +303,7 @@ Supported abbreviations for device registry configuration:
The following software has built-in support for MQTT discovery:
- [Arilux AL-LC0X LED controllers](https://github.com/mertenats/Arilux_AL-LC0X)
+- [ecowitt2mqtt](https://github.com/bachya/ecowitt2mqtt)
- [ESPHome](https://esphome.io)
- [ESPurna](https://github.com/xoseperez/espurna)
- [IOTLink](https://iotlink.gitlab.io) (starting with 2.0.0)
@@ -311,6 +312,8 @@ The following software has built-in support for MQTT discovery:
- [room-assistant](https://github.com/mKeRix/room-assistant) (starting with 1.1.0)
- [SmartHome](https://github.com/roncoa/SmartHome)
- [Tasmota](https://github.com/arendst/Tasmota) (starting with 5.11.1e, development halted)
+- [Teleinfo MQTT](https://github.com/fmartinou/teleinfo-mqtt) (starting with 3.0.0)
+- [What's up Docker?](https://github.com/fmartinou/whats-up-docker) (starting with 3.5.0)
- [WyzeSense2MQTT](https://github.com/raetha/wyzesense2mqtt)
- [Xiaomi DaFang Hacks](https://github.com/EliasKotlyar/Xiaomi-Dafang-Hacks)
- [Zigbee2mqtt](https://github.com/koenkk/zigbee2mqtt)
diff --git a/source/_docs/scripts.markdown b/source/_docs/scripts.markdown
index 98dd5df48ee..f76598b68eb 100644
--- a/source/_docs/scripts.markdown
+++ b/source/_docs/scripts.markdown
@@ -674,4 +674,4 @@ automation:
[service calls page]: /getting-started/scripts-service-calls/
[conditions page]: /getting-started/scripts-conditions/
[shorthand-template]: /docs/scripts/conditions/#template-condition-shorthand-notation
-[script variables]: /integrations/script/#-configuration-variables
+[script variables]: /integrations/script/#configuration-variables
diff --git a/source/_docs/z-wave/controllers.markdown b/source/_docs/z-wave/controllers.markdown
index e806ede7010..55aaaa829cb 100644
--- a/source/_docs/z-wave/controllers.markdown
+++ b/source/_docs/z-wave/controllers.markdown
@@ -13,13 +13,12 @@ This Z-Wave integration is deprecated and replaced with a [new implementation ba
You need to have a compatible Z-Wave stick or module installed. This needs to be a *static controller*, which most Z-Wave sticks and modules will be. If yours is a *bridge* device then it won't work with [OpenZWave](http://openzwave.com/), which is what provides Home Assistant's Z-Wave capabilities. The following devices have been confirmed to work:
-- Aeotec Z-Stick Series 5 (see note below)
+- Aeotec Z-Stick Gen5 (see note below)
- Everspring USB stick - Gen 5
- GoControl HUSBZB-1 stick
- Sigma Designs UZB stick
- Silicon Labs SLUSB7000A
- Vision USB stick - Gen5
-- Zooz Z-Wave Plus S2 stick ZST10
- ZWave.me Razberry Board
- ZWave.me UZB1 stick
@@ -34,7 +33,6 @@ We recommend that you purchase a [Z-Wave Plus](https://z-wavealliance.org/z-wave
The alternative to a stick is a hub that supports Z-Wave. Home Assistant supports the following hubs with Z-Wave support:
- [Vera](/integrations/vera/)
-- [Wink](/integrations/wink/)
- [Fibaro](/integrations/fibaro/)
- [SmartThings](/integrations/smartthings/)
diff --git a/source/_includes/installation/operating_system.md b/source/_includes/installation/operating_system.md
index 73d00f256ee..36829242140 100644
--- a/source/_includes/installation/operating_system.md
+++ b/source/_includes/installation/operating_system.md
@@ -54,6 +54,10 @@ We will need a few things to get started with installing Home Assistant. Links b
Prerequisites
This guide assumes that you have a dedicated generic x86 PC (typically an Intel or AMD-based system) available to exclusively run Home Assistant Operating System. The system must be 64-bit capable and able to boot using UEFI. Pretty much all systems produced in the last 10 years support the UEFI boot mode.
+
+Summary
+
+You will need to write the HAOS (Home Assistant OS) disk image directly to your boot media, and then configure your x86 to boot from this media, using UEFI boot mode.
### Configure the BIOS
@@ -69,15 +73,15 @@ To boot Home Assistant OS the BIOS needs to have UEFI boot mode enabled and Secu
1. Disable Secure Boot
-As a next step, we need to write the Operating System image to the installation media. Depending on your system this can be a S-ATA hard disk, S-ATA SSD, a M.2 SSD or even a eMMC. Home Assistant Operating System has no integrated installer. You need to use your Desktop computer (e.g. by using a USB to S-ATA adapter) or boot a live operating system on your target system to install Home Assistant Operating System.
+As a next step, we need to write the Operating System image to the target boot media (Your "boot media" is the disk, SSD, or eMMC that your x86-64 hardware will boot from when it is running Home Assistant). Depending on your system this can be a S-ATA hard disk, S-ATA SSD, a M.2 SSD or even a eMMC. Home Assistant Operating System has no integrated installer. You need to use your Desktop computer (e.g. by using a USB to S-ATA adapter) or boot a live operating system on your target system to install Home Assistant Operating System, by writing the disk image directly onto the boot media for your x86 system.
-If you prefer to use a live operating system, follow the instructions of your Live distribution (e.g., [this Ubuntu guide](https://ubuntu.com/tutorials/try-ubuntu-before-you-install)). Once you booted the live operating system, the following steps on how-to write the image to your installation media can be followed.
+If you prefer to use a live operating system, follow the instructions of your Live distribution (e.g., [this Ubuntu guide](https://ubuntu.com/tutorials/try-ubuntu-before-you-install)). Once you booted the live operating system, the following steps on how to write the image to your boot media can be followed.
{% endif %}
-### Write the image to your installation media
+### Write the image to your boot media
-1. Attach the installation media ({{site.installation.types[page.installation_type].installation_media}}) to your computer
+1. Attach the Home Assistant boot media ({{site.installation.types[page.installation_type].installation_media}}) to your computer
2. Download and start 
**Info** section of the **Developer Tools**.
-
-A [`command_line`](/integrations/sensor.command_line/) with
-[`hass`](/docs/tools/hass/) to display your current version.
-
-```yaml
-sensor:
- - platform: command_line
- name: Version
- command: "/home/homeassistant/bin/hass --version"
-```
-
-It's also possible to read a file called `.HA_VERSION` which is located in your
-Home Assistant [configuration](/docs/configuration/) folder.
-
-```yaml
-sensor:
- - platform: command_line
- name: Version
- command: "cat /home/homeassistant/.homeassistant/.HA_VERSION"
-```
-
-You might think that a [`rest` sensor](/integrations/rest) could work,
-too,
-but it will not as Home Assistant is not ready when the sensor gets initialized.
-
-{% raw %}
-
-```yaml
-sensor:
- - platform: rest
- resource: http://IP_ADDRESS:8123/api/config
- name: Current Version
- value_template: "{{ value_json.version }}"
-```
-
-{% endraw %}
diff --git a/source/_integrations/vesync.markdown b/source/_integrations/vesync.markdown
index 5d724d535dc..5a2cee259bb 100644
--- a/source/_integrations/vesync.markdown
+++ b/source/_integrations/vesync.markdown
@@ -126,5 +126,17 @@ sensor:
value_template: '{{ states.switch.vesync_switch.attributes["voltage"] | float }}'
unit_of_measurement: "V"
```
+{% endraw %}
+
+Extracting air quality from a VeSync LV-PUR131S air purifier. Change the `vesync_air_purifier` to match your device's entity ID.
+
+{% raw %}
+
+```yaml
+template:
+ - sensor:
+ - name: "VeSync Air Quality"
+ state: "{{ state_attr('fan.vesync_air_purifier', 'air_quality') | title }}"
+```
{% endraw %}
diff --git a/source/_integrations/vicare.markdown b/source/_integrations/vicare.markdown
index 9e1e1cf6484..c2bb70ce6c8 100644
--- a/source/_integrations/vicare.markdown
+++ b/source/_integrations/vicare.markdown
@@ -43,7 +43,7 @@ The above-required configuration parameters can be obtained as follows:
Google reCAPTCHA: Disabled
Redirect URIs: vicare://oauth-callback/everest
```
-4. Copy the Client ID to the configuration, e.g., `client_id="XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"`.
+4. Copy the Client ID to the configuration, e.g., `client_id: "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"`.
5. Set `username`and `password` to your Viessmann Developer Portal login credentials.
diff --git a/source/_integrations/webostv.markdown b/source/_integrations/webostv.markdown
index 6c0b075d355..d145f6217d7 100644
--- a/source/_integrations/webostv.markdown
+++ b/source/_integrations/webostv.markdown
@@ -8,6 +8,7 @@ ha_iot_class: Local Polling
ha_release: 0.18
ha_codeowners:
- '@bendavid'
+ - '@thecode'
ha_domain: webostv
ha_platforms:
- media_player
diff --git a/source/_integrations/wemo.markdown b/source/_integrations/wemo.markdown
index 78d457a1816..8fde46d4522 100644
--- a/source/_integrations/wemo.markdown
+++ b/source/_integrations/wemo.markdown
@@ -17,6 +17,7 @@ ha_platforms:
- binary_sensor
- fan
- light
+ - sensor
- switch
ha_codeowners:
- '@esev'
diff --git a/source/_integrations/wirelesstag.markdown b/source/_integrations/wirelesstag.markdown
index 7ea450c5633..ae5c89e7edd 100644
--- a/source/_integrations/wirelesstag.markdown
+++ b/source/_integrations/wirelesstag.markdown
@@ -13,6 +13,8 @@ ha_platforms:
- binary_sensor
- sensor
- switch
+ha_codeowners:
+ - '@sergeymaysak'
---
The `wirelesstag` implementation allows you to integrate your [wirelesstag.net](https://wirelesstag.net/) sensors tags in Home Assistant.
diff --git a/source/_integrations/wled.markdown b/source/_integrations/wled.markdown
index e1b5f9d5397..108ec900173 100644
--- a/source/_integrations/wled.markdown
+++ b/source/_integrations/wled.markdown
@@ -16,6 +16,7 @@ ha_zeroconf: true
ha_platforms:
- light
- sensor
+ - select
- switch
---
diff --git a/source/_integrations/xiaomi_miio.markdown b/source/_integrations/xiaomi_miio.markdown
index 2c2922f79f2..2e81a352bed 100644
--- a/source/_integrations/xiaomi_miio.markdown
+++ b/source/_integrations/xiaomi_miio.markdown
@@ -25,9 +25,12 @@ ha_platforms:
- binary_sensor
- device_tracker
- fan
+ - humidifier
- light
+ - number
- remote
- sensor
+ - select
- switch
- vacuum
---
@@ -429,32 +432,58 @@ Sensor | Description
### Air Humidifier (zhimi.humidifier.v1)
- On, Off
-- Operation modes (silent, medium, high, strong)
+- Operation modes (Silent, Medium, High, Strong)
- Buzzer (on, off)
- Child lock (on, off)
- LED (on, off), LED brightness (bright, dim, off)
- Target humidity (30, 40, 50, 60, 70, 80)
+- Attributes (humidifier platform)
+
+Attribute | Description
+--- | ---
+`humidity` | The current `target_humidity`
+`max_humidity` | The maximum settable `target_humidity`
+`min_humidity` | The minimum settable `target_humidity`
+`available_modes` | A list with the operation modes available
+`mode` | the current operation mode selected
+
- Sensor entities
- - `humidity`
- - `temperature`
+
+Sensor | Description
+--- | ---
+`humidity` | The current `humidity` measured
+`temperature` | The current `temperature` measured
### Air Humidifier CA (zhimi.humidifier.ca1)
- On, Off
-- Operation modes (silent, medium, high, auto)
+- Operation modes (Silent, Medium, High, Auto)
- Buzzer (on, off)
- Child lock (on, off)
- LED brightness (bright, dim, off)
- Target humidity (30, 40, 50, 60, 70, 80)
- Dry mode (on, off)
+- Attributes (humidifier platform)
+
+Attribute | Description
+--- | ---
+`humidity` | The current `target_humidity`
+`max_humidity` | The maximum settable `target_humidity`
+`min_humidity` | The minimum settable `target_humidity`
+`available_modes` | A list with the operation modes available
+`mode` | the current operation mode selected
+
- Sensor entities
- - `humidity`
- - `temperature`
+
+Sensor | Description
+--- | ---
+`humidity` | The current `humidity` measured
+`temperature` | The current `temperature` measured
### Air Humidifier CA (zhimi.humidifier.ca4)
- On, Off
-- Operation modes (auto, low, medium, high)
+- Operation modes (Auto, Low, Medium, High)
- Buzzer (on, off)
- Child lock (on, off)
- LED brightness (off, dim, bright)
@@ -462,11 +491,24 @@ Sensor | Description
- Clean mode (on, off)
- Dry mode (on, off)
- Motor speed rpm (200 - 2000)
+- Attributes (humidifier platform)
+
+Attribute | Description
+--- | ---
+`humidity` | The current `target_humidity`
+`max_humidity` | The maximum settable `target_humidity`
+`min_humidity` | The minimum settable `target_humidity`
+`available_modes` | A list with the operation modes available
+`mode` | the current operation mode selected
+
- Sensor entities
- - `actual_speed`
- - `humidity`
- - `temperature`
- - `water_level`
+
+Sensor | Description
+--- | ---
+`actual_speed` | The current `motor_speed` measured in (rpm)
+`humidity` | The current `humidity` percentage measured
+`temperature` | The current `temperature` measured in degrees Celius
+`water_level` | The current `water_level` percentage measured
{{section.title}}
diff --git a/source/_lovelace/energy.markdown b/source/_lovelace/energy.markdown
index 199c44b4427..50c8b17770b 100644
--- a/source/_lovelace/energy.markdown
+++ b/source/_lovelace/energy.markdown
@@ -60,11 +60,15 @@ type: energy-solar-graph
The energy distribution card shows how the energy flowed, from the grid to your house, from your solar panels to your house and/or back to the grid.
+
If setup, it will also tell you how many kWh of the energy you got from the grid was produced without using fossil fuels.
+If you set `link_dashboard` to `true`, the card will include a link to the energy dashboard.
+
#### Example
```yaml
type: energy-distribution
+link_dashboard: true
```
## Energy sources table
diff --git a/source/_lovelace/picture-elements.markdown b/source/_lovelace/picture-elements.markdown
index 59e2732b632..8fe22b78b8c 100644
--- a/source/_lovelace/picture-elements.markdown
+++ b/source/_lovelace/picture-elements.markdown
@@ -550,10 +550,10 @@ elements:
filter: saturate(.8)
state_filter:
"on": brightness(120%) saturate(1.2)
- style:
- top: 25%
- left: 75%
- width: 15%
+ style:
+ top: 25%
+ left: 75%
+ width: 15%
# Camera, red border, rounded-rectangle - show more-info on click
- type: image
entity: camera.driveway_camera
diff --git a/source/_lovelace/statistics-graph.markdown b/source/_lovelace/statistics-graph.markdown
index 2629892ef6c..6a13d4205c5 100644
--- a/source/_lovelace/statistics-graph.markdown
+++ b/source/_lovelace/statistics-graph.markdown
@@ -41,7 +41,7 @@ chart_type:
required: false
description: If the chart should be rendered as a `bar` or a `line` chart.
type: string
-state_types:
+stat_types:
required: false
description: The stat types to render. `min`, `max`, `mean`, `sum`
type: list
diff --git a/source/_posts/2021-08-04-home-energy-management.markdown b/source/_posts/2021-08-04-home-energy-management.markdown
new file mode 100644
index 00000000000..44305c2f491
--- /dev/null
+++ b/source/_posts/2021-08-04-home-energy-management.markdown
@@ -0,0 +1,132 @@
+---
+layout: post
+title: "Energy Management in Home Assistant"
+description: "Monitor your energy usage, transition to sustainable energy and save money."
+date: 2021-08-04 00:01:00
+date_formatted: "August 4, 2021"
+author: Paulus Schoutsen
+author_twitter: balloob
+comments: true
+categories:
+- Announcements
+og_image: /images/blog/2021-08-energy/social.png
+feedback: true
+---
+
+_TL; DR: We're adding energy management and [it's awesome](https://demo.home-assistant.io/#/energy). Created two products to read out electricity meters: [SlimmeLezer](https://www.slimmelezer.nl) for P1 ports & [Home Assistant Glow](https://github.com/klaasnicolaas/home-assistant-glow) for activity LEDs. Upgraded most of the [existing energy integrations](/integrations/#energy) to be compatible._
+
+
+
+The world is in a climate crisis. Global warming is a reality and the weather is getting unpredictable. Our way of living needs to change, at all levels. I am worried that the climate crisis is something that the world is going to try to solve too late and after irreversible damages have already been done.
+
+So with Home Assistant we want to do our part to help take on the climate crisis, and help you do the same. One part of fighting the climate crisis is making sure our homes are energy efficient and use low-carbon energy sources.
+
+Starting today, Home Assistant is adding official support for home energy management. Our energy management will help users monitor the energy usage, transition to sustainable energy and save money.
+
+
+
+Home automation and energy management are built on top of knowing what devices are doing
+
+
+
+
+Home Assistant won’t have all the answers when it comes to energy management, at least not right away. But we have two key things going for us that makes us the perfect platform to choose for your energy management:
+
+The first is that we’re completely open. This means that with Home Assistant, anyone can use [the source](https://github.com/home-assistant/core) or [its collected data](https://data.home-assistant.io/) and build anything with it. We already see this happening: the [European federation of citizen energy cooperatives](https://www.rescoop.eu/) is using Home Assistant to build [energy management software tailored for communities](https://www.rescoopvpp.eu/blog/presenting-the-cofy-box). We are part of a rich ecosystem with many different approaches, all connected with Home Assistant.
+
+The second thing is that we have a passionate and global community that wants to make their homes the best it can be. A community that revolves around building and sharing their own hardware and software to be able to achieve their goals. Through experimentation and iteration we will be able to improve energy management over time to fit our needs – there are no investors to satisfy.
+
+When it comes to your home, Home Assistant is the best platform to manage it and figure out what works and what doesn’t.
+
+
+
+## Energy Dashboard
+
+Today's release of [Home Assistant Core 2021.8](/blog/2021/08/04/release-20218/) contains a new energy dashboard ([demo](https://demo.home-assistant.io/#/energy)). The goal is to make it super easy for users to get insight into their energy usage. The dashboard has been designed to see at a quick glance how you're doing today, with the option to also break down per hour to see what happened when. It also includes indicators to help you identify your reliance on the grid and if adding energy storage would help your situation.
+
+
+
+(above) Different ways of looking at your consumption will help you better understand your energy usage
+(below) The energy usage graph shows per hour how much energy you used from the grid, how much energy you produced and how much of that energy went back to the grid.
+
+
+ +Energy management is complicated, so we made sure that our energy settings are as easy as it can be. They are accompanied with [documentation](/docs/energy/) to further explain the different concepts. + +Users can configure their consumption and production and Home Assistant will do the rest. Home Assistant can pull in energy data from any supported hardware such as smart energy meters, inverters, CT clamps, pulse monitors and smart plugs. + +
+
+The configuration is separated into different sections.
+
+
+Happy August! ☀️
+
+Home Assistant Core 2021.8 is here, and this is the release I have been looking
+forward to for months! There is so much exciting new stuff in here: I don't
+know where to start.
+
+The most exciting part is the new main focus that is added to Home Assistant:
+
+**Home Energy management.**
+
+A massive deal for a lot of people, no matter if you are doing it for
+environmental reasons or simply to save a buck or two (or both 😬). Knowing
+that moving forward, it will be an additional focus, I think, is amazing.
+
+But besides the Energy management stuff, I'm also excited about the side effects
+of it. A lot of things created for Energy, are also re-usable for other things!
+That is how we roll, right?
+
+We get long-term statistics, new super nice and fast graphs, and a new
+layout option for Lovelace. All the building blocks are available for
+customization and re-use. I am looking forward to seeing how they are going
+to be put to use.
+
+Anyways, enjoy the release! And don't forget the drop by
+[the release party on YouTube](https://www.youtube.com/watch?v=VLiqDkam33k)
+later today (9:00 PM CET).
+
+../Frenck
+
+- [Matthias de Baat joins Nabu Casa](#matthias-de-baat-joins-nabu-casa)
+- [Home Energy Management!](#home-energy-management)
+- [Long term statistics](#long-term-statistics)
+- [Sidebar view](#sidebar-view)
+- [Gauge card now has needle mode](#gauge-card-now-has-needle-mode)
+- [Currency core setting](#currency-core-setting)
+- [Siren](#siren)
+- [Locking, Unlocking and Jammed](#locking-unlocking-and-jammed)
+- [Scripts/Automations/Templates](#scriptsautomationstemplates)
+ - [This](#this)
+ - [Device template functions](#device-template-functions)
+- [Other noteworthy changes](#other-noteworthy-changes)
+- [New Integrations](#new-integrations)
+- [New Platforms](#new-platforms)
+- [Integrations now available to set up from the UI](#integrations-now-available-to-set-up-from-the-ui)
+- [Release 2021.8.1 - August 4](#release-202181---august-4)
+- [Release 2021.8.2 - August 5](#release-202182---august-5)
+- [Release 2021.8.3 - August 6](#release-202183---august-6)
+- [Release 2021.8.4 - August 8](#release-202184---august-8)
+- [Release 2021.8.5 - August 9](#release-202185---august-9)
+- [Release 2021.8.6 - August 10](#release-202186---august-10)
+- [Release 2021.8.7 - August 15](#release-202187---august-15)
+- [Release 2021.8.8 - August 18](#release-202188---august-18)
+- [If you need help...](#if-you-need-help)
+- [Breaking Changes](#breaking-changes)
+- [Farewell to the following](#farewell-to-the-following)
+- [All changes](#all-changes)
+
+## Matthias de Baat joins Nabu Casa
+
+Let start by announcing that [Matthias de Baat](https://twitter.com/matthiasdebaat)
+is joining the team at [Nabu Casa](https://nabucasa.com/) to work on
+Home Assistant as a UX-designer.
+
+UX stands for "User Experience", which is Matthias' area of expertise and what
+he will be working on improving. His goal is to make Home Assistant easier to
+use and accessible for everyone. He will be setting up design processes and
+tooling, doing user research and making designs.
+
+If you are interested in joining the Home Assistant user research group, you
+can show your interest by filling in this [Google Form](https://forms.gle/5NSabxHJ3qkp7Vke9)
+that Matthias has prepared.
+
+Welcome Matthias! Excited to have you on board!
+
+But wait! There is more!
+
+[Otto Winter][@ottowinter], the founder of [ESPHome](https://esphome.io/), will
+be joining Nabu Casa during his summer break as well! Welcome Otto! This summer
+is going to be fantastic!
+
+## Home Energy Management!
+
+This feature is a big thing; A start of something new. Home Assistant is going
+to provide you insight into your energy usage.
+
+But this needs more than just a paragraph in the release notes, this needs
+its own blog! So, at this point, stop reading the release notes (momentarily)
+and read the blog Paulus has written about this:
+
+[Read the blog about the new Home Energy Management features of Home Assistant](/blog/2021/08/04/home-energy-management/)
+
+## Long term statistics
+
+Storing sensor data for a more extended period using the recorder, can make your
+database grow pretty fast (especially if you have sensors that update a lot!).
+
+In the previous releases, we've worked towards improving this situation and
+laid down the groundwork for tracking statistics in the database;
+We are making it widely available this release!
+
+Integrations can now hint Home Assistant about the type of value the sensor
+represents, allowing us to process and store that data in a more efficient way.
+Every hour, we calculate things like mean, min/max values, or the difference
+created that hour and store just that result in our long-term statistics.
+
+These statistics is what partly powers the new Energy dashboard, however,
+they can be used for anything else: Introducing the Lovelace [statistics graph card](/lovelace/statistics-graph/).
+
+
+
+Screenshot of the new Lovelace statistics graph card.
+
+
+Screenshot of new Lovelace sidebar view layout.
+
+
+Screenshot of the Gauge card in needle mode with severity configured.
+
diff --git a/source/home-energy-management/index.html b/source/home-energy-management/index.html
index 7555864ce14..86f9370ef08 100644
--- a/source/home-energy-management/index.html
+++ b/source/home-energy-management/index.html
@@ -5,10 +5,11 @@ date: 2021-07-28
description: "Monitor your energy usage, transition to sustainable energy and save money"
hero_image: /images/energy/hero.jpg
og_image: /images/blog/2021-08-energy/social.png
+frontpage_image: /images/frontpage/energy-frontpage.jpg
tagline: The world is heating up. Together we can fix that.
sections:
- title: "Monitor usage"
- description: "Monitor the energy usage, transition to sustainable energy and save money."
+ description: "Easily track your different power sources and their tariffs."
image: /images/energy/vector-graph.png
entries:
- title: "Know where it goes."
@@ -18,13 +19,17 @@ sections:
description: "Track the energy use of individual devices to see their impact on your energy consumption."
image: /images/energy/individual_devices.png
- - title: "Track your costs"
- description: "Home Assistant helps you keep track of the costs and compensation for your energy consumption and production."
- image: /images/energy/vector-money.png
+ - title: "Supercharge your solar panels"
+ description: "Schedule power usage based on solar production predictions."
+ image: /images/energy/vector-sun.png
entries:
- - title: "Consumption overview."
- description: "Get an overview of your energy consumption."
- image: /images/energy/cost.png
+ - title: "Time your usage."
+ description: "It’s cheaper to consume the energy you produce than to give it back to the grid. Home Assistant helps you conserve the energy you don't use for later."
+ image: /images/blog/2021-08-energy/solar-production.png
+ style: >-
+ background: rgb(255,244,201);
+ background: radial-gradient(at bottom left, rgb(255, 244, 201) 0%, rgb(255, 252, 223) 15%, rgb(255, 221, 80) 100%);
+ border-radius: 15px;
- title: "Use any hardware"
description: ""
@@ -45,13 +50,17 @@ sections:
image_description: "Home Assistant Glow attached to an energy meter"
read_more: /docs/energy/electricity-grid/#reading-the-meter-via-a-pulse-counter
- - title: "Supercharge your solar panels"
- description: "Schedule power usage based on solar production predictions."
- image: /images/energy/vector-sun.png
+ - title: "Track your costs"
+ description: "Home Assistant helps you keep track of the costs and compensation for your energy consumption and production."
+ image: /images/energy/vector-money.png
entries:
- - title: "Time your usage."
- description: "It’s cheaper to consume the energy you produce than to give it back to the grid. Home Assistant helps you turn on the power-hungry things when your usage needs a boost."
- image: /images/blog/2021-08-energy/solar-production.png
+ - title: "Consumption overview."
+ description: "Get an overview of your energy consumption."
+ image: /images/energy/cost.png
+ style: >-
+ background: rgb(201,255,224);
+ background: linear-gradient(90deg, rgba(0,255,102,0.3925770991990546) 0%, rgba(223,255,235,1) 85%, rgba(201,255,224,1) 100%);
+ border-radius: 15px;
---
@@ -61,7 +70,7 @@ sections:
@@ -73,3 +82,4 @@ sections:
Already have Home Assistant? {% my energy title="Start here" %}
diff --git a/source/images/blog/2021-08-energy/architecture.png b/source/images/blog/2021-08-energy/architecture.png
new file mode 100644
index 00000000000..fd83504209d
Binary files /dev/null and b/source/images/blog/2021-08-energy/architecture.png differ
diff --git a/source/images/blog/2021-08-energy/config-dialogs.png b/source/images/blog/2021-08-energy/config-dialogs.png
new file mode 100644
index 00000000000..0422a3ef371
Binary files /dev/null and b/source/images/blog/2021-08-energy/config-dialogs.png differ
diff --git a/source/images/blog/2021-08-energy/energy-usage.png b/source/images/blog/2021-08-energy/energy-usage.png
new file mode 100644
index 00000000000..f4eeafaf6cd
Binary files /dev/null and b/source/images/blog/2021-08-energy/energy-usage.png differ
diff --git a/source/images/blog/2021-08-energy/klaas-prototype.png b/source/images/blog/2021-08-energy/klaas-prototype.png
new file mode 100644
index 00000000000..2d76b2feaa9
Binary files /dev/null and b/source/images/blog/2021-08-energy/klaas-prototype.png differ
diff --git a/source/images/blog/2021-08-energy/sidebar-widgets.png b/source/images/blog/2021-08-energy/sidebar-widgets.png
new file mode 100644
index 00000000000..c5470884008
Binary files /dev/null and b/source/images/blog/2021-08-energy/sidebar-widgets.png differ
diff --git a/source/images/blog/2021-08-energy/social.png b/source/images/blog/2021-08-energy/social.png
new file mode 100644
index 00000000000..be691d4a9fc
Binary files /dev/null and b/source/images/blog/2021-08-energy/social.png differ
diff --git a/source/images/blog/2021-08-energy/solar-production.png b/source/images/blog/2021-08-energy/solar-production.png
new file mode 100644
index 00000000000..f9f3d57fc16
Binary files /dev/null and b/source/images/blog/2021-08-energy/solar-production.png differ
diff --git a/source/images/blog/2021-08/gauge-needle.png b/source/images/blog/2021-08/gauge-needle.png
new file mode 100644
index 00000000000..d379f335883
Binary files /dev/null and b/source/images/blog/2021-08/gauge-needle.png differ
diff --git a/source/images/blog/2021-08/sidebar-view.png b/source/images/blog/2021-08/sidebar-view.png
new file mode 100644
index 00000000000..adf90e0925b
Binary files /dev/null and b/source/images/blog/2021-08/sidebar-view.png differ
diff --git a/source/images/blog/2021-08/social.png b/source/images/blog/2021-08/social.png
new file mode 100644
index 00000000000..02db8dd39dd
Binary files /dev/null and b/source/images/blog/2021-08/social.png differ
diff --git a/source/images/blog/2021-08/statistics-graph.png b/source/images/blog/2021-08/statistics-graph.png
new file mode 100644
index 00000000000..5065a36f3ce
Binary files /dev/null and b/source/images/blog/2021-08/statistics-graph.png differ
diff --git a/source/images/frontpage/blue-frontpage.jpg b/source/images/frontpage/blue-frontpage.jpg
new file mode 100644
index 00000000000..5851e0e7ecd
Binary files /dev/null and b/source/images/frontpage/blue-frontpage.jpg differ
diff --git a/source/images/frontpage/energy-frontpage.jpg b/source/images/frontpage/energy-frontpage.jpg
new file mode 100644
index 00000000000..e38d9b78698
Binary files /dev/null and b/source/images/frontpage/energy-frontpage.jpg differ
diff --git a/source/index.html b/source/index.html
index 2ae9aa6eb24..0a780cff660 100644
--- a/source/index.html
+++ b/source/index.html
@@ -95,7 +95,7 @@ feedback: false
class="material-card picture-promo"
href="{{page.url}}"
style="
- background-image: url({{page.hero_image | default:page.og_image}});
+ background-image: url({{page.frontpage_image | default:page.og_image}});
background-size: cover;
background-color: #41bdf5;
"
diff --git a/source/lovelace/cards.markdown b/source/lovelace/cards.markdown
index 8100698ab3d..6e3d84de7a2 100644
--- a/source/lovelace/cards.markdown
+++ b/source/lovelace/cards.markdown
@@ -3,6 +3,6 @@ title: "Cards"
description: "Lovelace cards."
---
-The cards are the what make the interface of your Lovelace dashboard.
+Cards provide a structure for interfacing with your Lovelace dashboard.
-There are a lot of card types, each with it's own configuration options, pick a card in the menu to see the options for that card.
\ No newline at end of file
+There are several built-in card types, each with their own configuration options. Select a card from the menu to view additional details and the options for that card.