From c0e9f352b3baf10eb500b6c2d47a3e2da4300de5 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 23 Apr 2020 13:17:13 +0200 Subject: [PATCH 1/4] Bump kramdown from 2.1.0 to 2.2.0 (#13141) Bumps [kramdown](https://github.com/gettalong/kramdown) from 2.1.0 to 2.2.0. - [Release notes](https://github.com/gettalong/kramdown/releases) - [Changelog](https://github.com/gettalong/kramdown/blob/master/doc/news.page) - [Commits](https://github.com/gettalong/kramdown/commits) Signed-off-by: dependabot-preview[bot] Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> --- Gemfile.lock | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 29440d0f77f..b9355f4e4a7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -60,7 +60,8 @@ GEM jekyll jekyll-watch (2.2.1) listen (~> 3.0) - kramdown (2.1.0) + kramdown (2.2.0) + rexml kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) liquid (4.0.3) @@ -86,6 +87,7 @@ GEM rb-fsevent (0.10.3) rb-inotify (0.10.1) ffi (~> 1.0) + rexml (3.2.4) rouge (3.18.0) ruby-enum (0.8.0) i18n @@ -96,6 +98,8 @@ GEM sass (>= 3.1) sassc (2.3.0) ffi (~> 1.9) + sassc (2.3.0-x64-mingw32) + ffi (~> 1.9) sinatra (2.0.8.1) mustermann (~> 1.0) rack (~> 2.0) From 9bedd6250518e9e7ff4ba520d56c3377e1b3951a Mon Sep 17 00:00:00 2001 From: TopdRob Date: Thu, 23 Apr 2020 14:14:53 +0200 Subject: [PATCH 2/4] Added BRP069B41 to the supported hardware section (#13137) * Added BRP069B41 to the supported hardware section Added BRP069B41 to the supported hardware section confirmed it works with the integration. * :pencil2: Tweak Co-authored-by: Franck Nijhof --- source/_integrations/daikin.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/_integrations/daikin.markdown b/source/_integrations/daikin.markdown index 98a7f4592c7..7c4c0aedf18 100644 --- a/source/_integrations/daikin.markdown +++ b/source/_integrations/daikin.markdown @@ -25,7 +25,7 @@ There is currently support for the following device types within Home Assistant: ## Supported hardware -- The European versions of the Wifi Controller Unit (BRP069A41, 42, 43, 45), which is powered by the [Daikin Online Controller](https://play.google.com/store/apps/details?id=eu.daikin.remoapp) application. The new versions of WiFi Controller Unit (BRP069Bxx) also should work but it have to be confirmed by users. Tested and working device is BRP069B45. +- The European versions of the Wifi Controller Unit (BRP069A41, 42, 43, 45), which is powered by the [Daikin Online Controller](https://play.google.com/store/apps/details?id=eu.daikin.remoapp) application. The new versions of WiFi Controller Unit (BRP069Bxx) also should work but it have to be confirmed by users. Tested and working devices are the BRP069B41 and BRP069B45. - The Australian version of the Daikin Wifi Controller Unit BRP072A42. Confirmed working on a Daikin Cora Series Reverse Cycle Split System Air Conditioner 2.5kW Cooling FTXM25QVMA with operation mode, temp, fan swing (3d, horizontal, vertical) which is powered by the [Daikin Mobile Controller](https://itunes.apple.com/au/app/daikin-mobile-controller/id917168708?mt=8) ([Android version](https://play.google.com/store/apps/details?id=eu.daikin.remoapp)) application. - The Australian version of the Daikin Wifi Controller for **AirBase** units (BRP15B61), which is powered by the [Daikin Airbase](https://play.google.com/store/apps/details?id=au.com.daikin.airbase) application. From 147af7770d3963d0684435e610a144015e42a52c Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 23 Apr 2020 18:53:16 +0200 Subject: [PATCH 3/4] Bump kramdown from 2.2.0 to 2.2.1 (#13146) Bumps [kramdown](https://github.com/gettalong/kramdown) from 2.2.0 to 2.2.1. - [Release notes](https://github.com/gettalong/kramdown/releases) - [Changelog](https://github.com/gettalong/kramdown/blob/master/doc/news.page) - [Commits](https://github.com/gettalong/kramdown/commits) Signed-off-by: dependabot-preview[bot] Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index b9355f4e4a7..b883f754a30 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -60,7 +60,7 @@ GEM jekyll jekyll-watch (2.2.1) listen (~> 3.0) - kramdown (2.2.0) + kramdown (2.2.1) rexml kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) From 6822785b6f97baa1cdfd58aef64b62ca5d14177d Mon Sep 17 00:00:00 2001 From: Jo Verbeeck Date: Fri, 24 Apr 2020 00:55:11 +0200 Subject: [PATCH 4/4] Update utility_meter.markdown (#13136) Pedantic: Energy (kWh or Joule) is not power (W or J/s), correct naming of variables --- source/_integrations/utility_meter.markdown | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/source/_integrations/utility_meter.markdown b/source/_integrations/utility_meter.markdown index f7a0633776f..7673775e0e0 100644 --- a/source/_integrations/utility_meter.markdown +++ b/source/_integrations/utility_meter.markdown @@ -170,19 +170,19 @@ So, tracking daily and monthly consumption for each sensor, will require setting ```yaml utility_meter: - daily_power_offpeak: + daily_energy_offpeak: source: sensor.energy_consumption_tarif_1 cycle: daily - daily_power_peak: + daily_energy_peak: source: sensor.energy_consumption_tarif_2 cycle: daily daily_gas: source: sensor.gas_consumption cycle: daily - monthly_power_offpeak: + monthly_energy_offpeak: source: sensor.energy_consumption_tarif_1 cycle: monthly - monthly_power_peak: + monthly_energy_peak: source: sensor.energy_consumption_tarif_2 cycle: monthly monthly_gas: @@ -197,13 +197,13 @@ Additionally, you can add template sensors to compute daily and monthly total us sensor: - platform: template sensors: - daily_power: - friendly_name: Daily Power + daily_energy: + friendly_name: Daily Energy unit_of_measurement: kWh - value_template: "{{ states('sensor.daily_power_offpeak')|float + states('sensor.daily_power_peak')|float }}" - monthly_power: - friendly_name: Monthly Power + value_template: "{{ states('sensor.daily_energy_offpeak')|float + states('sensor.daily_energy_peak')|float }}" + monthly_energy: + friendly_name: Monthly Energy unit_of_measurement: kWh - value_template: "{{ states('sensor.monthly_power_offpeak')|float + states('sensor.monthly_power_peak')|float }}" + value_template: "{{ states('sensor.monthly_energy_offpeak')|float + states('sensor.monthly_energy_peak')|float }}" ``` {% endraw %}