Merge branch 'current' into next

Gemfile.lock

@@ -60,7 +60,8 @@ GEM
       jekyll
     jekyll-watch (2.2.1)
       listen (~> 3.0)
-    kramdown (2.1.0)
+    kramdown (2.2.1)
+      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)

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.
 

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:
+      daily_energy:
-        friendly_name: Daily Power
+        friendly_name: Daily Energy
         unit_of_measurement: kWh
-        value_template: "{{ states('sensor.daily_power_offpeak')|float + states('sensor.daily_power_peak')|float }}"
+        value_template: "{{ states('sensor.daily_energy_offpeak')|float + states('sensor.daily_energy_peak')|float }}"
-      monthly_power:
+      monthly_energy:
-        friendly_name: Monthly Power
+        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 %}