Home-IoT/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2024-11-27 09:18:00 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

refactor(mr60fda2): fall text sensor to fall binary sensor

Browse source
This commit is contained in:
Spencer Yan 2024-10-22 16:27:06 +08:00
parent 31d27cb8db
commit 88e80e8247
3 changed files with 14 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
esphome/components/seeed_mr60fda2/binary_sensor.py
View file

@ -1,24 +1,33 @@
import esphome.codegen as cg import esphome.codegen as cg
from esphome.components import binary_sensor from esphome.components import binary_sensor
import esphome.config_validation as cv import esphome.config_validation as cv
from esphome.const import DEVICE_CLASS_OCCUPANCY from esphome.const import DEVICE_CLASS_OCCUPANCY, DEVICE_CLASS_SAFETY
from . import CONF_MR60FDA2_ID, MR60FDA2Component from . import CONF_MR60FDA2_ID, MR60FDA2Component
DEPENDENCIES = ["seeed_mr60fda2"] DEPENDENCIES = ["seeed_mr60fda2"]
CONF_PEOPLE_EXIST = "people_exist" CONF_PEOPLE_EXIST = "people_exist"
CONF_IS_FALL = "is_fall"
CONFIG_SCHEMA = { CONFIG_SCHEMA = {
cv.GenerateID(CONF_MR60FDA2_ID): cv.use_id(MR60FDA2Component), cv.GenerateID(CONF_MR60FDA2_ID): cv.use_id(MR60FDA2Component),
cv.Optional(CONF_PEOPLE_EXIST): binary_sensor.binary_sensor_schema( cv.Optional(CONF_PEOPLE_EXIST): binary_sensor.binary_sensor_schema(
device_class=DEVICE_CLASS_OCCUPANCY, icon="mdi:motion-sensor" device_class=DEVICE_CLASS_OCCUPANCY, icon="mdi:motion-sensor"
), ),
cv.Optional(CONF_IS_FALL): binary_sensor.binary_sensor_schema(
device_class=DEVICE_CLASS_SAFETY, icon="mdi:emergency"
),
} }
async def to_code(config): async def to_code(config):
mr60fda2_component = await cg.get_variable(config[CONF_MR60FDA2_ID]) mr60fda2_component = await cg.get_variable(config[CONF_MR60FDA2_ID])
if people_exist_config := config.get(CONF_PEOPLE_EXIST): if people_exist_config := config.get(CONF_PEOPLE_EXIST):
sens = await binary_sensor.new_binary_sensor(people_exist_config) sens = await binary_sensor.new_binary_sensor(people_exist_config)
cg.add(mr60fda2_component.set_people_exist_binary_sensor(sens)) cg.add(mr60fda2_component.set_people_exist_binary_sensor(sens))
if is_fall_config := config.get(CONF_IS_FALL):
sens = await binary_sensor.new_binary_sensor(is_fall_config)
cg.add(mr60fda2_component.set_is_fall_binary_sensor(sens))

12
esphome/components/seeed_mr60fda2/seeed_mr60fda2.cpp
View file

@ -14,6 +14,7 @@ void MR60FDA2Component::dump_config() {
ESP_LOGCONFIG(TAG, "MR60FDA2:"); ESP_LOGCONFIG(TAG, "MR60FDA2:");
#ifdef USE_BINARY_SENSOR #ifdef USE_BINARY_SENSOR
LOG_BINARY_SENSOR(" ", "People Exist Binary Sensor", this->people_exist_binary_sensor_); LOG_BINARY_SENSOR(" ", "People Exist Binary Sensor", this->people_exist_binary_sensor_);
LOG_BINARY_SENSOR(" ", "Is Fall Binary Sensor", this->is_fall_binary_sensor_);
#endif #endif
#ifdef USE_BUTTON #ifdef USE_BUTTON
LOG_BUTTON(" ", "Get Radar Parameters Button", this->get_radar_parameters_button_); LOG_BUTTON(" ", "Get Radar Parameters Button", this->get_radar_parameters_button_);
@ -24,9 +25,6 @@ void MR60FDA2Component::dump_config() {
LOG_SELECT(" ", "Height Threshold Select", this->height_threshold_select_); LOG_SELECT(" ", "Height Threshold Select", this->height_threshold_select_);
LOG_SELECT(" ", "Sensitivity Select", this->sensitivity_select_); LOG_SELECT(" ", "Sensitivity Select", this->sensitivity_select_);
#endif #endif
#ifdef USE_TEXT_SENSOR
LOG_TEXT_SENSOR(" ", "Is Fall Text Sensor", this->is_fall_text_sensor_);
#endif
} }
// Initialisation functions // Initialisation functions
@ -227,12 +225,8 @@ void MR60FDA2Component::split_frame_(uint8_t buffer) {
void MR60FDA2Component::process_frame_() { void MR60FDA2Component::process_frame_() {
switch (this->current_frame_type_) { switch (this->current_frame_type_) {
case IS_FALL_TYPE_BUFFER: case IS_FALL_TYPE_BUFFER:
if (this->is_fall_text_sensor_ != nullptr) { if (this->is_fall_binary_sensor_ != nullptr) {
if (this->current_frame_buf_[LEN_TO_HEAD_CKSUM] == 0) { this->is_fall_binary_sensor_->publish_state(this->current_frame_buf_[LEN_TO_HEAD_CKSUM]);
this->is_fall_text_sensor_->publish_state("Normal");
} else if (this->current_frame_buf_[LEN_TO_HEAD_CKSUM] == 1) {
this->is_fall_text_sensor_->publish_state("Falling");
}
} }
this->current_frame_locate_ = LOCATE_FRAME_HEADER; this->current_frame_locate_ = LOCATE_FRAME_HEADER;
break; break;

4
esphome/components/seeed_mr60fda2/seeed_mr60fda2.h
View file

@ -61,6 +61,7 @@ class MR60FDA2Component : public Component,
public uart::UARTDevice { // The class name must be the name defined by text_sensor.py public uart::UARTDevice { // The class name must be the name defined by text_sensor.py
#ifdef USE_BINARY_SENSOR #ifdef USE_BINARY_SENSOR
SUB_BINARY_SENSOR(people_exist) SUB_BINARY_SENSOR(people_exist)
SUB_BINARY_SENSOR(is_fall)
#endif #endif
#ifdef USE_BUTTON #ifdef USE_BUTTON
SUB_BUTTON(get_radar_parameters) SUB_BUTTON(get_radar_parameters)
@ -71,9 +72,6 @@ class MR60FDA2Component : public Component,
SUB_SELECT(height_threshold) SUB_SELECT(height_threshold)
SUB_SELECT(sensitivity) SUB_SELECT(sensitivity)
#endif #endif
#ifdef USE_TEXT_SENSOR
SUB_TEXT_SENSOR(is_fall)
#endif
protected: protected:
uint8_t current_frame_locate_; uint8_t current_frame_locate_;