From 20c0d788d16db05f7905c1e7fdaa10b14aa2b047 Mon Sep 17 00:00:00 2001
From: mvturnho <qris.online@gmail.com>
Date: Sun, 26 May 2019 11:08:52 +0200
Subject: [PATCH] fixed issues with code

---
 esphome/components/mpr121/__init__.py      | 11 ++++++-----
 esphome/components/mpr121/binary_sensor.py |  3 ++-
 esphome/components/mpr121/init.py          |  4 ++++
 esphome/const.py                           |  4 ----
 4 files changed, 12 insertions(+), 10 deletions(-)
 create mode 100644 esphome/components/mpr121/init.py

diff --git a/esphome/components/mpr121/__init__.py b/esphome/components/mpr121/__init__.py
index acfd319e4d..c1ce825a89 100644
--- a/esphome/components/mpr121/__init__.py
+++ b/esphome/components/mpr121/__init__.py
@@ -1,7 +1,8 @@
 import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.components import i2c
-from esphome.const import CONF_ID, CONF_RELEASE_DEBOUNCE, CONF_TOUCH_DEBOUNCE, \
+from esphome.const import CONF_ID
+from init import CONF_RELEASE_DEBOUNCE, CONF_TOUCH_DEBOUNCE, \
     CONF_TOUCH_THRESHOLD, CONF_RELEASE_THRESHOLD
 
 DEPENDENCIES = ['i2c']
@@ -14,10 +15,10 @@ MPR121Component = mpr121_ns.class_('MPR121Component', cg.Component, i2c.I2CDevic
 MULTI_CONF = True
 CONFIG_SCHEMA = cv.Schema({
     cv.GenerateID(): cv.declare_id(MPR121Component),
-    cv.Optional(CONF_RELEASE_DEBOUNCE): cv.int_range(min=0, max=7),
-    cv.Optional(CONF_TOUCH_DEBOUNCE):  cv.All(cv.Coerce(int), cv.Range(min=0, max=7)),
-    cv.Optional(CONF_TOUCH_THRESHOLD): cv.All(cv.Coerce(int), cv.Range(min=0x05, max=0x30)),
-    cv.Optional(CONF_RELEASE_THRESHOLD): cv.All(cv.Coerce(int), cv.Range(min=0x05, max=0x30)),
+    cv.Optional(CONF_RELEASE_DEBOUNCE, default=0): cv.int_range(min=0, max=7),
+    cv.Optional(CONF_TOUCH_DEBOUNCE, default=0):  cv.All(cv.Coerce(int), cv.Range(min=0, max=7)),
+    cv.Optional(CONF_TOUCH_THRESHOLD, default=0x06): cv.All(cv.Coerce(int), cv.Range(min=0x05, max=0x30)),
+    cv.Optional(CONF_RELEASE_THRESHOLD, default=0x0b): cv.All(cv.Coerce(int), cv.Range(min=0x05, max=0x30)),
 }).extend(cv.COMPONENT_SCHEMA).extend(i2c.i2c_device_schema(0x5A))
 
 
diff --git a/esphome/components/mpr121/binary_sensor.py b/esphome/components/mpr121/binary_sensor.py
index c908924877..26dc48d6d0 100644
--- a/esphome/components/mpr121/binary_sensor.py
+++ b/esphome/components/mpr121/binary_sensor.py
@@ -1,7 +1,8 @@
 import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.components import binary_sensor
-from esphome.const import CONF_CHANNEL, CONF_ID, CONF_TOUCH_THRESHOLD, CONF_RELEASE_THRESHOLD
+from esphome.const import CONF_ID, CONF_CHANNEL
+from init import CONF_TOUCH_THRESHOLD, CONF_RELEASE_THRESHOLD
 from . import mpr121_ns, MPR121Component, CONF_MPR121_ID
 
 DEPENDENCIES = ['mpr121']
diff --git a/esphome/components/mpr121/init.py b/esphome/components/mpr121/init.py
new file mode 100644
index 0000000000..5d340d3150
--- /dev/null
+++ b/esphome/components/mpr121/init.py
@@ -0,0 +1,4 @@
+CONF_TOUCH_THRESHOLD = "touch_threshold"
+CONF_RELEASE_THRESHOLD = "release_threshold"
+CONF_TOUCH_DEBOUNCE = "touch_debounce"
+CONF_RELEASE_DEBOUNCE = "release_debounce"
\ No newline at end of file
diff --git a/esphome/const.py b/esphome/const.py
index 8418239ad5..d58ed406c7 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -448,10 +448,6 @@ CONF_WIFI = 'wifi'
 CONF_WILL_MESSAGE = 'will_message'
 CONF_WINDOW_SIZE = 'window_size'
 CONF_ZERO = 'zero'
-CONF_TOUCH_THRESHOLD = "touch_threshold"
-CONF_RELEASE_THRESHOLD = "release_threshold"
-CONF_TOUCH_DEBOUNCE = "touch_debounce"
-CONF_RELEASE_DEBOUNCE = "release_debounce"
 
 ICON_ARROW_EXPAND_VERTICAL = 'mdi:arrow-expand-vertical'
 ICON_BATTERY = 'mdi:battery'