From 5c183adc0c044c2dfa80483b3f0607df4e7dcbf3 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Fri, 27 Mar 2020 01:41:03 +0000
Subject: [PATCH 1/3] Elkm1 config flow

---
 source/_integrations/elkm1.markdown | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/source/_integrations/elkm1.markdown b/source/_integrations/elkm1.markdown
index 603603fcb336..04f384f71e99 100644
--- a/source/_integrations/elkm1.markdown
+++ b/source/_integrations/elkm1.markdown
@@ -30,8 +30,9 @@ There is currently support for the following device types within Home Assistant:
 
 ## Configuration
 
-To integrate one or more Elk-M1 controllers with Home Assistant, add the following
-section to your `configuration.yaml` file:
+To add `ElkM1` to your installation, go to **Configuration** >> **Integrations** in the UI, click the button with `+` sign and from the list of integrations select **Elk-M1 Control**.
+
+Alternatively, add the following section to your `configuration.yaml` file:
 
 ```yaml
 # Example configuration.yaml entry

From 6d6011b9e98e58cf472f535e6d6de3a04fb40a54 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Thu, 26 Mar 2020 20:45:12 -0500
Subject: [PATCH 2/3] Add auto_configure

---
 source/_integrations/elkm1.markdown | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/source/_integrations/elkm1.markdown b/source/_integrations/elkm1.markdown
index 04f384f71e99..1396b7906170 100644
--- a/source/_integrations/elkm1.markdown
+++ b/source/_integrations/elkm1.markdown
@@ -13,6 +13,9 @@ ha_category:
   - Switch
 ha_iot_class: Local Push
 ha_domain: elkm1
+ha_config_flow: true
+ha_codeowners:
+  - '@bdraco'
 ---
 
 The Elk-M1 is a home security and automation controller that is capable of alarm control panel functions and automation.
@@ -65,6 +68,11 @@ temperature_unit:
   required: false
   type: string
   default: F
+auto_configure:
+  description: Auto configure `area`, `counter`, `keypad`, `output`, `setting`, `task`, `thermostat`, `plc`, and `zone` by only adding elements that ElkM1 reports on the initial sync.
+  required: false
+  type: boolean
+  default: False
 area:
   description: Elk areas to include in Home Assistant.
   required: false

From a2d6a3a51e09cfe11523ad620946a1297411a9b4 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Thu, 26 Mar 2020 20:47:00 -0500
Subject: [PATCH 3/3] Update elkm1.markdown

---
 source/_integrations/elkm1.markdown | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/source/_integrations/elkm1.markdown b/source/_integrations/elkm1.markdown
index 1396b7906170..c9ed4200ad5d 100644
--- a/source/_integrations/elkm1.markdown
+++ b/source/_integrations/elkm1.markdown
@@ -280,6 +280,16 @@ elkm1:
     exclude: [b12-d5]
 ```
 
+Example configuration using `auto_configure`:
+
+```yaml
+elkm1:
+  host: elks://IP_ADDRESS
+  username: USERNAME
+  password: PASSWORD
+  auto_configure: true
+```
+
 Example for a serial port instance on /dev/ttyUSB0 at 115200 baud:
 
 ```yaml