mirror of
https://github.com/esphome/esphome.git
synced 2024-11-27 09:18:00 +01:00
Mpr121 added debounce and thresholds config (#558)
* fixed code issues from previous PR * travis line to long * travis * more travis * Update esphome/components/mpr121/mpr121.h Co-Authored-By: Otto Winter <otto@otto-winter.com> * fixed issues * fixed issues * fixes remove duplicate line remove threshold settings * fixed touch release thresholds mixup
This commit is contained in:
parent
2570f2d6f2
commit
9e56318498
4 changed files with 56 additions and 6 deletions
|
@ -3,6 +3,11 @@ import esphome.config_validation as cv
|
||||||
from esphome.components import i2c
|
from esphome.components import i2c
|
||||||
from esphome.const import CONF_ID
|
from esphome.const import CONF_ID
|
||||||
|
|
||||||
|
CONF_TOUCH_THRESHOLD = "touch_threshold"
|
||||||
|
CONF_RELEASE_THRESHOLD = "release_threshold"
|
||||||
|
CONF_TOUCH_DEBOUNCE = "touch_debounce"
|
||||||
|
CONF_RELEASE_DEBOUNCE = "release_debounce"
|
||||||
|
|
||||||
DEPENDENCIES = ['i2c']
|
DEPENDENCIES = ['i2c']
|
||||||
AUTO_LOAD = ['binary_sensor']
|
AUTO_LOAD = ['binary_sensor']
|
||||||
|
|
||||||
|
@ -13,10 +18,18 @@ MPR121Component = mpr121_ns.class_('MPR121Component', cg.Component, i2c.I2CDevic
|
||||||
MULTI_CONF = True
|
MULTI_CONF = True
|
||||||
CONFIG_SCHEMA = cv.Schema({
|
CONFIG_SCHEMA = cv.Schema({
|
||||||
cv.GenerateID(): cv.declare_id(MPR121Component),
|
cv.GenerateID(): cv.declare_id(MPR121Component),
|
||||||
|
cv.Optional(CONF_RELEASE_DEBOUNCE, default=0): cv.int_range(min=0, max=7),
|
||||||
|
cv.Optional(CONF_TOUCH_DEBOUNCE, default=0): cv.int_range(min=0, max=7),
|
||||||
|
cv.Optional(CONF_TOUCH_THRESHOLD, default=0x0b): cv.int_range(min=0x05, max=0x30),
|
||||||
|
cv.Optional(CONF_RELEASE_THRESHOLD, default=0x06): cv.int_range(min=0x05, max=0x30),
|
||||||
}).extend(cv.COMPONENT_SCHEMA).extend(i2c.i2c_device_schema(0x5A))
|
}).extend(cv.COMPONENT_SCHEMA).extend(i2c.i2c_device_schema(0x5A))
|
||||||
|
|
||||||
|
|
||||||
def to_code(config):
|
def to_code(config):
|
||||||
var = cg.new_Pvariable(config[CONF_ID])
|
var = cg.new_Pvariable(config[CONF_ID])
|
||||||
|
cg.add(var.set_touch_debounce(config[CONF_TOUCH_DEBOUNCE]))
|
||||||
|
cg.add(var.set_release_debounce(config[CONF_RELEASE_DEBOUNCE]))
|
||||||
|
cg.add(var.set_touch_threshold(config[CONF_TOUCH_THRESHOLD]))
|
||||||
|
cg.add(var.set_release_threshold(config[CONF_RELEASE_THRESHOLD]))
|
||||||
yield cg.register_component(var, config)
|
yield cg.register_component(var, config)
|
||||||
yield i2c.register_i2c_device(var, config)
|
yield i2c.register_i2c_device(var, config)
|
||||||
|
|
|
@ -2,7 +2,8 @@ import esphome.codegen as cg
|
||||||
import esphome.config_validation as cv
|
import esphome.config_validation as cv
|
||||||
from esphome.components import binary_sensor
|
from esphome.components import binary_sensor
|
||||||
from esphome.const import CONF_CHANNEL, CONF_ID
|
from esphome.const import CONF_CHANNEL, CONF_ID
|
||||||
from . import mpr121_ns, MPR121Component, CONF_MPR121_ID
|
from . import mpr121_ns, MPR121Component, CONF_MPR121_ID, CONF_TOUCH_THRESHOLD, \
|
||||||
|
CONF_RELEASE_THRESHOLD
|
||||||
|
|
||||||
DEPENDENCIES = ['mpr121']
|
DEPENDENCIES = ['mpr121']
|
||||||
MPR121Channel = mpr121_ns.class_('MPR121Channel', binary_sensor.BinarySensor)
|
MPR121Channel = mpr121_ns.class_('MPR121Channel', binary_sensor.BinarySensor)
|
||||||
|
@ -11,14 +12,20 @@ CONFIG_SCHEMA = binary_sensor.BINARY_SENSOR_SCHEMA.extend({
|
||||||
cv.GenerateID(): cv.declare_id(MPR121Channel),
|
cv.GenerateID(): cv.declare_id(MPR121Channel),
|
||||||
cv.GenerateID(CONF_MPR121_ID): cv.use_id(MPR121Component),
|
cv.GenerateID(CONF_MPR121_ID): cv.use_id(MPR121Component),
|
||||||
cv.Required(CONF_CHANNEL): cv.int_range(min=0, max=11),
|
cv.Required(CONF_CHANNEL): cv.int_range(min=0, max=11),
|
||||||
|
cv.Optional(CONF_TOUCH_THRESHOLD): cv.int_range(min=0x05, max=0x30),
|
||||||
|
cv.Optional(CONF_RELEASE_THRESHOLD): cv.int_range(min=0x05, max=0x30),
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|
||||||
def to_code(config):
|
def to_code(config):
|
||||||
var = cg.new_Pvariable(config[CONF_ID])
|
var = cg.new_Pvariable(config[CONF_ID])
|
||||||
yield binary_sensor.register_binary_sensor(var, config)
|
yield binary_sensor.register_binary_sensor(var, config)
|
||||||
|
hub = yield cg.get_variable(config[CONF_MPR121_ID])
|
||||||
cg.add(var.set_channel(config[CONF_CHANNEL]))
|
cg.add(var.set_channel(config[CONF_CHANNEL]))
|
||||||
|
|
||||||
hub = yield cg.get_variable(config[CONF_MPR121_ID])
|
if CONF_TOUCH_THRESHOLD in config:
|
||||||
|
cg.add(var.set_touch_threshold(config[CONF_TOUCH_THRESHOLD]))
|
||||||
|
if CONF_RELEASE_THRESHOLD in config:
|
||||||
|
cg.add(var.set_release_threshold(config[CONF_RELEASE_THRESHOLD]))
|
||||||
|
|
||||||
cg.add(hub.register_channel(var))
|
cg.add(hub.register_channel(var))
|
||||||
|
|
|
@ -18,9 +18,11 @@ void MPR121Component::setup() {
|
||||||
}
|
}
|
||||||
|
|
||||||
// set touch sensitivity for all 12 channels
|
// set touch sensitivity for all 12 channels
|
||||||
for (uint8_t i = 0; i < 12; i++) {
|
for (auto *channel : this->channels_) {
|
||||||
this->write_byte(MPR121_TOUCHTH_0 + 2 * i, 12);
|
this->write_byte(MPR121_TOUCHTH_0 + 2 * channel->channel_,
|
||||||
this->write_byte(MPR121_RELEASETH_0 + 2 * i, 6);
|
channel->touch_threshold_.value_or(this->touch_threshold_));
|
||||||
|
this->write_byte(MPR121_RELEASETH_0 + 2 * channel->channel_,
|
||||||
|
channel->release_threshold_.value_or(this->release_threshold_));
|
||||||
}
|
}
|
||||||
this->write_byte(MPR121_MHDR, 0x01);
|
this->write_byte(MPR121_MHDR, 0x01);
|
||||||
this->write_byte(MPR121_NHDR, 0x01);
|
this->write_byte(MPR121_NHDR, 0x01);
|
||||||
|
@ -44,6 +46,19 @@ void MPR121Component::setup() {
|
||||||
// start with first 5 bits of baseline tracking
|
// start with first 5 bits of baseline tracking
|
||||||
this->write_byte(MPR121_ECR, 0x8F);
|
this->write_byte(MPR121_ECR, 0x8F);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void MPR121Component::set_touch_debounce(uint8_t debounce) {
|
||||||
|
uint8_t mask = debounce << 4;
|
||||||
|
this->debounce_ &= 0x0f;
|
||||||
|
this->debounce_ |= mask;
|
||||||
|
}
|
||||||
|
|
||||||
|
void MPR121Component::set_release_debounce(uint8_t debounce) {
|
||||||
|
uint8_t mask = debounce & 0x0f;
|
||||||
|
this->debounce_ &= 0xf0;
|
||||||
|
this->debounce_ |= mask;
|
||||||
|
};
|
||||||
|
|
||||||
void MPR121Component::dump_config() {
|
void MPR121Component::dump_config() {
|
||||||
ESP_LOGCONFIG(TAG, "MPR121:");
|
ESP_LOGCONFIG(TAG, "MPR121:");
|
||||||
LOG_I2C_DEVICE(this);
|
LOG_I2C_DEVICE(this);
|
||||||
|
|
|
@ -46,17 +46,29 @@ enum {
|
||||||
};
|
};
|
||||||
|
|
||||||
class MPR121Channel : public binary_sensor::BinarySensor {
|
class MPR121Channel : public binary_sensor::BinarySensor {
|
||||||
|
friend class MPR121Component;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
void set_channel(uint8_t channel) { channel_ = channel; }
|
void set_channel(uint8_t channel) { channel_ = channel; }
|
||||||
void process(uint16_t data) { this->publish_state(static_cast<bool>(data & (1 << this->channel_))); }
|
void process(uint16_t data) { this->publish_state(static_cast<bool>(data & (1 << this->channel_))); }
|
||||||
|
void set_touch_threshold(uint8_t touch_threshold) { this->touch_threshold_ = touch_threshold; };
|
||||||
|
void set_release_threshold(uint8_t release_threshold) { this->release_threshold_ = release_threshold; };
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
uint8_t channel_{0};
|
uint8_t channel_{0};
|
||||||
|
optional<uint8_t> touch_threshold_{};
|
||||||
|
optional<uint8_t> release_threshold_{};
|
||||||
};
|
};
|
||||||
|
|
||||||
class MPR121Component : public Component, public i2c::I2CDevice {
|
class MPR121Component : public Component, public i2c::I2CDevice {
|
||||||
public:
|
public:
|
||||||
void register_channel(MPR121Channel *channel) { this->channels_.push_back(channel); }
|
void register_channel(MPR121Channel *channel) { this->channels_.push_back(channel); }
|
||||||
|
void set_touch_debounce(uint8_t debounce);
|
||||||
|
void set_release_debounce(uint8_t debounce);
|
||||||
|
void set_touch_threshold(uint8_t touch_threshold) { this->touch_threshold_ = touch_threshold; };
|
||||||
|
void set_release_threshold(uint8_t release_threshold) { this->release_threshold_ = release_threshold; };
|
||||||
|
uint8_t get_touch_threshold() { return this->touch_threshold_; };
|
||||||
|
uint8_t get_release_threshold() { return this->release_threshold_; };
|
||||||
void setup() override;
|
void setup() override;
|
||||||
void dump_config() override;
|
void dump_config() override;
|
||||||
float get_setup_priority() const override { return setup_priority::DATA; }
|
float get_setup_priority() const override { return setup_priority::DATA; }
|
||||||
|
@ -64,6 +76,9 @@ class MPR121Component : public Component, public i2c::I2CDevice {
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
std::vector<MPR121Channel *> channels_{};
|
std::vector<MPR121Channel *> channels_{};
|
||||||
|
uint8_t debounce_{0};
|
||||||
|
uint8_t touch_threshold_{};
|
||||||
|
uint8_t release_threshold_{};
|
||||||
enum ErrorCode {
|
enum ErrorCode {
|
||||||
NONE = 0,
|
NONE = 0,
|
||||||
COMMUNICATION_FAILED,
|
COMMUNICATION_FAILED,
|
||||||
|
|
Loading…
Reference in a new issue