From 0f03e6e96cb60d248644dc6d466cbe216e25fbb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joakim=20S=C3=B8rensen?= Date: Fri, 30 Jul 2021 11:07:58 +0200 Subject: [PATCH 01/10] Add default value for active installations (#18666) --- source/_includes/asides/component_navigation.html | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/source/_includes/asides/component_navigation.html b/source/_includes/asides/component_navigation.html index 48e12ec653e..0d33e833122 100644 --- a/source/_includes/asides/component_navigation.html +++ b/source/_includes/asides/component_navigation.html @@ -1,4 +1,5 @@ -{% assign percentage = 100.0 | times: site.data.analytics_data.integrations[page.ha_domain] | divided_by: site.data.analytics_data.reports_integrations | round: 1 %} +{% assign active_installations = site.data.analytics_data.integrations[page.ha_domain] | default: 0 %} +{% assign percentage = 100.0 | times: active_installations | divided_by: site.data.analytics_data.reports_integrations | round: 1 %}
{%- if page.logo -%} @@ -17,7 +18,7 @@ and it's used by {% if percentage < 1 %} - {{ site.data.analytics_data.integrations[page.ha_domain] }} active installations. + {{ active_installations }} active installations. {% else %} {{ percentage | remove: ".0" }}% of the active installations. {% endif %} From cacb36403448309abea1dd0d84703e48fe580e45 Mon Sep 17 00:00:00 2001 From: Eduardo Roldan Date: Fri, 30 Jul 2021 06:33:26 -0300 Subject: [PATCH 02/10] Update tplink.markdown (#18664) Corrected wrong template name example. --- source/_integrations/tplink.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/_integrations/tplink.markdown b/source/_integrations/tplink.markdown index a34f5d0e740..5dfb8ed248a 100644 --- a/source/_integrations/tplink.markdown +++ b/source/_integrations/tplink.markdown @@ -166,7 +166,7 @@ sensor: value_template: "{{ state_attr('switch.my_tp_switch','current_a') }}" unit_of_measurement: "A" my_tp_switch_watts: - friendly_name_template: "{{ state_attr('switch.my_tp_switch','friendly_name') }} Current Consumption" + friendly_name_template: "{{ state_attr('switch.my_tp_switch','friendly_name') }} Power" value_template: "{{ state_attr('switch.my_tp_switch','current_power_w') }}" unit_of_measurement: "W" my_tp_switch_total_kwh: From ec07f409762e1017d449cd525ad1fd59d46ab07e Mon Sep 17 00:00:00 2001 From: peyanski Date: Fri, 30 Jul 2021 14:33:31 +0300 Subject: [PATCH 03/10] Update hikvision.markdown (#18667) The stated Annke NVR is also confirmed working. As reference check this article - https://peyanski.com/annke-c800-annke-nvr-home-assistant-integration/ --- source/_integrations/hikvision.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/source/_integrations/hikvision.markdown b/source/_integrations/hikvision.markdown index d69de480cbe..cfb480fb517 100644 --- a/source/_integrations/hikvision.markdown +++ b/source/_integrations/hikvision.markdown @@ -66,6 +66,7 @@ and has been confirmed to work with the following models: This platform also was confirmed to work with the following Hikvison-based NVRS - N46PCK (Annke H800 4K NVR) +- N48PAW (Annke 4K NVR) ## Configuration From fa480e793e8081441da3ff4abb0c143db9c74edf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 Aug 2021 11:52:47 +0200 Subject: [PATCH 04/10] Bump ruby/setup-ruby from 1.78.0 to 1.79.0 (#18688) Bumps [ruby/setup-ruby](https://github.com/ruby/setup-ruby) from 1.78.0 to 1.79.0. - [Release notes](https://github.com/ruby/setup-ruby/releases) - [Commits](https://github.com/ruby/setup-ruby/compare/v1.78.0...v1.79.0) --- updated-dependencies: - dependency-name: ruby/setup-ruby dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 76dc3dc6548..6823c57eef2 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -57,7 +57,7 @@ jobs: - name: Check out files from GitHub uses: actions/checkout@v2.3.4 - name: Setting up Ruby 2.6 - uses: ruby/setup-ruby@v1.78.0 + uses: ruby/setup-ruby@v1.79.0 with: ruby-version: 2.6 - name: Setup Ruby Gems cache From 34a97542d977a415c5ecab977054eab8f49b0177 Mon Sep 17 00:00:00 2001 From: Chris Browet Date: Mon, 2 Aug 2021 12:40:34 +0200 Subject: [PATCH 05/10] FIX: It's "trace:", not "traces:" (#18683) Not actually sure if it's a doc or code bug, but "traces:" is refused while "trace:" works --- source/_docs/automation/yaml.markdown | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/_docs/automation/yaml.markdown b/source/_docs/automation/yaml.markdown index 36c3368ebcf..3d0ad65144b 100644 --- a/source/_docs/automation/yaml.markdown +++ b/source/_docs/automation/yaml.markdown @@ -118,12 +118,12 @@ automation: ### Number of debug traces stored -When using YAML you can configure the number of debugging traces stored for an automation. This is controlled with the `stored_traces` option under `traces`. Set `stored_traces` to the number of traces you wish to store for the particular automation. If not specified the default value of 5 will be used. +When using YAML you can configure the number of debugging traces stored for an automation. This is controlled with the `stored_traces` option under `trace`. Set `stored_traces` to the number of traces you wish to store for the particular automation. If not specified the default value of 5 will be used. ```yaml automation: - alias: "Automation Name" - traces: + trace: stored_traces: 10 trigger: - platform: ... From 077f32fa88c3440067b128f6460a05f40cf8684d Mon Sep 17 00:00:00 2001 From: Erik Montnemery Date: Mon, 2 Aug 2021 13:26:25 +0200 Subject: [PATCH 06/10] Clarify light `white` turn_on parameter has no corresponding state attribute (#18674) --- source/_integrations/light.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/_integrations/light.markdown b/source/_integrations/light.markdown index 03a0f492050..659c2b75b87 100644 --- a/source/_integrations/light.markdown +++ b/source/_integrations/light.markdown @@ -53,7 +53,7 @@ Most lights do not support all attributes. You can check the integration documen | `brightness_pct`| yes | Alternatively, you can specify brightness in percent (a number between 0 and 100), where 0 means the light is off, 1 is the minimum brightness and 100 is the maximum brightness supported by the light. | `brightness_step` | yes | Change brightness by an amount. Should be between -255..255. | `brightness_step_pct` | yes | Change brightness by a percentage. Should be between -100..100. -| `white` | yes | Set the light to white mode and change its brightness, where 0 means the light is off, 1 is the minimum brightness and 255 is the maximum brightness supported by the light. +| `white` | yes | Set the light to white mode and change its brightness, where 0 means the light is off, 1 is the minimum brightness and 255 is the maximum brightness supported by the light. Note that `white` does not have a corresponding state attribute, the `color_mode` state attribute will to `white` and the `brightness` state attribute will be set to the requested brightness. | `flash` | yes | Tell light to flash, can be either value `short` or `long`. | `effect`| yes | Applies an effect such as `colorloop` or `random`. From d6df7b1e105238cfbbb81915c6fde9f362b42870 Mon Sep 17 00:00:00 2001 From: Erik Montnemery Date: Mon, 2 Aug 2021 13:28:06 +0200 Subject: [PATCH 07/10] Update scene examples (#18675) --- source/_integrations/scene.markdown | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/source/_integrations/scene.markdown b/source/_integrations/scene.markdown index 6ce6fcf82ca..e3b44220cf8 100644 --- a/source/_integrations/scene.markdown +++ b/source/_integrations/scene.markdown @@ -12,7 +12,7 @@ ha_domain: scene You can create scenes that capture the states you want certain entities to be. For example, a scene can specify that light A should be turned on and light B should be bright red. -Scenes can be created and managed via the user interface using the [Scene Editor](/docs/scene/editor/). They can also be configured via `configuration.yaml`: +Scenes can be created and managed via the user interface using the [Scene Editor](/docs/scene/editor/). They can also be manually configured via `configuration.yaml`. Note that the entity data is not service call parameters, it's a representation of the wanted state: ```yaml # Example configuration.yaml entry @@ -23,17 +23,26 @@ scene: light.tv_back_light: "on" light.ceiling: state: "on" - xy_color: [0.33, 0.66] brightness: 200 + color_mode: "xy" + xy_color: [0.33, 0.66] - name: Movies entities: light.tv_back_light: state: "on" brightness: 125 - light.ceiling: off + light.ceiling: "off" media_player.sony_bravia_tv: state: "on" source: HDMI 1 + - name: Standard + entities: + light.tv_back_light: + state: "off" + light.ceiling: + state: "on" + brightness: 125 + color_mode: "white" ``` {% configuration %} From 816b4095626185489c51aedc7efcb94f8d87d1bc Mon Sep 17 00:00:00 2001 From: pdcemulator <20071350+pdcemulator@users.noreply.github.com> Date: Mon, 2 Aug 2021 14:13:31 +0200 Subject: [PATCH 08/10] edl21: Add DZG DWS76 as tested smart meter (#18655) --- source/_integrations/edl21.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/source/_integrations/edl21.markdown b/source/_integrations/edl21.markdown index 31805194240..196d4b080be 100644 --- a/source/_integrations/edl21.markdown +++ b/source/_integrations/edl21.markdown @@ -24,6 +24,7 @@ Compatible transceivers: Tested smart meters: - APATOR Norax 3D (enable InF Mode as described in manual to retrieve full data) +- DZG DWS76 (enable InF as described in manual to retrieve full data) - Iskraemeco MT175 (ISKRA MT175-D2A51-V22-K0t) ## Configuration From a640ef6f429588903fee4e0d83d2bbc3845bfff0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joakim=20S=C3=B8rensen?= Date: Mon, 2 Aug 2021 23:40:37 +0200 Subject: [PATCH 09/10] Update about section (#18702) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Joakim Sørensen Co-authored-by: Paulus Schoutsen --- _config.yml | 5 ++++- source/_includes/asides/about.html | 2 +- source/_includes/custom/welcome.html | 6 +++--- source/index.html | 2 -- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/_config.yml b/_config.yml index 7ad17af55ab..af8df207535 100644 --- a/_config.yml +++ b/_config.yml @@ -8,7 +8,10 @@ title: Home Assistant subtitle: Open source home automation that puts local control and privacy first. author: Home Assistant simple_search: https://www.google.com/search -description: Open source home automation that puts local control and privacy first. +description: >- + Open source home automation that puts local control and privacy first. + Powered by a worldwide community of tinkerers and DIY enthusiasts. + Perfect to run on a Raspberry Pi or a local server. # Default date format is "ordinal" (resulting in "July 22nd 2007") # You can customize the format as defined in diff --git a/source/_includes/asides/about.html b/source/_includes/asides/about.html index e4a12f32618..f5e5c5ddae4 100644 --- a/source/_includes/asides/about.html +++ b/source/_includes/asides/about.html @@ -2,7 +2,7 @@

About Home Assistant

  • - Home Assistant is an open-source home automation platform running on Python 3. Track and control all devices at home and automate control. + {{ site.description }}
  • Get started with Home Assistant
  • Try the online demo
    • diff --git a/source/_includes/custom/welcome.html b/source/_includes/custom/welcome.html index 2f3c2a73673..0f40cac8780 100644 --- a/source/_includes/custom/welcome.html +++ b/source/_includes/custom/welcome.html @@ -1,6 +1,6 @@ -

    Awaken your home

    -

    -Open source home automation that puts local control and privacy first. Powered by a worldwide community of tinkerers and DIY enthusiasts. Perfect to run on a Raspberry Pi or a local server. +

    Awaken your home

    +

    + {{ site.description }}

    diff --git a/source/index.html b/source/index.html index 7903ffd15a8..c0dec86e595 100644 --- a/source/index.html +++ b/source/index.html @@ -5,8 +5,6 @@ hero_unit: true is_homepage: true regenerate: true feedback: false -description: - Open source home automation that puts local control and privacy first. ---

    From 7557551485c32b374083d6a89240379ed97eb745 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 3 Aug 2021 09:27:54 +0200 Subject: [PATCH 10/10] Bump nokogiri from 1.11.7 to 1.12.0 (#18710) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Gemfile | 2 +- Gemfile.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Gemfile b/Gemfile index bef93375399..45ec8205d48 100644 --- a/Gemfile +++ b/Gemfile @@ -21,7 +21,7 @@ group :jekyll_plugins do end gem 'sinatra', '2.1.0' -gem 'nokogiri', '1.11.7' +gem 'nokogiri', '1.12.0' # Windows and JRuby does not include zoneinfo files, so bundle the tzinfo-data gem # and associated library diff --git a/Gemfile.lock b/Gemfile.lock index 82d62738ad2..7cc3df49d7f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -70,14 +70,14 @@ GEM rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) mercenary (0.4.0) - mini_portile2 (2.5.3) + mini_portile2 (2.6.1) multi_json (1.15.0) mustermann (1.1.1) ruby2_keywords (~> 0.0.1) - nokogiri (1.11.7) - mini_portile2 (~> 2.5.0) + nokogiri (1.12.0) + mini_portile2 (~> 2.6.1) racc (~> 1.4) - nokogiri (1.11.7-x64-mingw32) + nokogiri (1.12.0-x64-mingw32) racc (~> 1.4) pathutil (0.16.2) forwardable-extended (~> 2.6) @@ -130,7 +130,7 @@ DEPENDENCIES jekyll-sitemap (= 1.4.0) jekyll-time-to-read (= 0.1.2) jekyll-toc (= 0.17.1) - nokogiri (= 1.11.7) + nokogiri (= 1.12.0) rake (= 13.0.6) sass-globbing (= 1.1.5) sassc (= 2.1.0)