From 745d5467a68023d59eadc7ec6060eb88eae0d12d Mon Sep 17 00:00:00 2001
From: Marvin Wichmann <marvin.wichmann@unic.com>
Date: Sun, 23 Dec 2018 19:35:04 +0100
Subject: [PATCH 1/3] Updated docs of knx climate device

---
 source/_components/climate.knx.markdown | 49 +++++++++++++++++++++++--
 1 file changed, 46 insertions(+), 3 deletions(-)

diff --git a/source/_components/climate.knx.markdown b/source/_components/climate.knx.markdown
index 839be5243982..9e93cdc1e27c 100644
--- a/source/_components/climate.knx.markdown
+++ b/source/_components/climate.knx.markdown
@@ -47,6 +47,31 @@ climate:
     operation_mode_comfort_address: '5/1/7'
 ```
 
+`operation_mode_frost_protection_address` / `operation_mode_night_address` / `operation_mode_comfort_address` are not necessary if `operation_mode_address` is specified.
+
+If your device doesn't support setpoint_shift calculations (i.e. if you don't provide a `setpoint_shift_address` value) please set the `min_temp` and `max_temp`
+attributes of the climate device to avoid issues with increasing the temperature in the frontend.
+
+The following values are valid for the `operation_modes` attribute:
+
+- Auto
+- Comfort
+- Standby
+- Night
+- Frost Protection
+- Heat
+- Morning Warmup
+- Cool
+- Night Purge
+- Precool
+- Off
+- Emergency Heat
+- Fan only
+- Ice
+- Dry
+- NoDem
+
+
 {% configuration %}
 name:
   description: A name for this device used within Home Assistant.
@@ -112,6 +137,24 @@ operation_mode_comfort_address:
   description: KNX address for switching on/off comfort mode.
   required: false
   type: string
-{% endconfiguration %}
-
-`operation_mode_frost_protection_address` / `operation_mode_night_address` / `operation_mode_comfort_address` are not necessary if `operation_mode_address` is specified.
+operation_modes:
+  description: Overrides the supported operation modes.
+  required: false
+  type: array
+on_off_address:
+  description: KNX address for switching the climate device on/off.
+  required: false
+  type: string
+on_off_state_address:
+  description: KNX address for gathering the current state (on/off) of the climate device.
+  required: false
+  type: string
+min_temp:
+  description: Override the minimum temperature.
+  required: false
+  type: float
+max_temp:
+  description: Override the maximum temperature.
+  required: false
+  type: float
+{% endconfiguration %}
\ No newline at end of file

From cc1ce37ea2e421c4cf4fffe6f22d0e98980e6ff8 Mon Sep 17 00:00:00 2001
From: Marvin Wichmann <marvin.wichmann@unic.com>
Date: Wed, 26 Dec 2018 15:09:17 +0100
Subject: [PATCH 2/3] Updated docs to reflect changes in HA.

---
 source/_components/climate.knx.markdown | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/source/_components/climate.knx.markdown b/source/_components/climate.knx.markdown
index 9e93cdc1e27c..12cabcddf116 100644
--- a/source/_components/climate.knx.markdown
+++ b/source/_components/climate.knx.markdown
@@ -54,22 +54,12 @@ attributes of the climate device to avoid issues with increasing the temperature
 
 The following values are valid for the `operation_modes` attribute:
 
-- Auto
 - Comfort
 - Standby
 - Night
 - Frost Protection
-- Heat
-- Morning Warmup
-- Cool
-- Night Purge
-- Precool
-- Off
-- Emergency Heat
 - Fan only
-- Ice
 - Dry
-- NoDem
 
 
 {% configuration %}
@@ -125,6 +115,14 @@ controller_status_state_address:
   description: Explicit KNX address for reading HVAC controller status.
   required: false
   type: string
+controller_mode_address:
+  description: KNX address for handling controller modes.
+  required: false 
+  type: string
+controller_mode_state_address:
+  description: Explicit KNX address for reading HVAC Control Mode.
+  required: false
+  type: string
 operation_mode_frost_protection_address:
   description: KNX address for switching on/off frost/heat protection mode.
   required: false

From 3a8df439b345acb5f4687e5bab1814c94be0c774 Mon Sep 17 00:00:00 2001
From: Marvin Wichmann <marvin.wichmann@unic.com>
Date: Sat, 5 Jan 2019 14:55:51 +0100
Subject: [PATCH 3/3] Updated docs to mention the internal mapping

---
 source/_components/climate.knx.markdown | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/source/_components/climate.knx.markdown b/source/_components/climate.knx.markdown
index 0b47f53b3268..d121ed48283e 100644
--- a/source/_components/climate.knx.markdown
+++ b/source/_components/climate.knx.markdown
@@ -54,12 +54,12 @@ attributes of the climate device to avoid issues with increasing the temperature
 
 The following values are valid for the `operation_modes` attribute:
 
-- Comfort
-- Standby
-- Night
-- Frost Protection
-- Fan only
-- Dry
+- Comfort (maps internally to STATE_HEAT within Home Assistant)
+- Standby (maps internally to STATE_ECO within Home Assistant)
+- Night (maps internally to STATE_IDLE within Home Assistant)
+- Frost Protection (maps internally to STATE_MANUAL within Home Assistant)
+- Fan only (maps internally to STATE_FAN_ONLY within Home Assistant)
+- Dehumidification (maps internally to STATE_DRY within Home Assistant)
 
 {% configuration %}
 name: