From 3a8c7a6d13cd8723a32ca367e1ab1708c0b150a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor=20Poczkodi?= Date: Thu, 29 Feb 2024 04:22:22 +0100 Subject: [PATCH] removed the component from Sensor, making it top level --- esphome/components/cc1101/__init__.py | 85 +++++++++++++++++++++++++++ esphome/components/cc1101/cc1101.h | 3 +- esphome/components/cc1101/sensor.py | 84 -------------------------- 3 files changed, 86 insertions(+), 86 deletions(-) delete mode 100644 esphome/components/cc1101/sensor.py diff --git a/esphome/components/cc1101/__init__.py b/esphome/components/cc1101/__init__.py index 88f63f3043..8b2d3b1ef3 100644 --- a/esphome/components/cc1101/__init__.py +++ b/esphome/components/cc1101/__init__.py @@ -1 +1,86 @@ +import esphome.codegen as cg +import esphome.config_validation as cv +from esphome import automation, pins +from esphome.components import sensor +from esphome.components import spi +from esphome.automation import maybe_simple_id +from esphome.const import ( + CONF_ID, + CONF_FREQUENCY, + UNIT_EMPTY, + UNIT_DECIBEL_MILLIWATT, + DEVICE_CLASS_SIGNAL_STRENGTH, + STATE_CLASS_MEASUREMENT, +) + +DEPENDENCIES = ["spi"] + CODEOWNERS = ["@gabest11"] + +CONF_GDO0 = "gdo0" +CONF_BANDWIDTH = "bandwidth" +# CONF_FREQUENCY = "frequency" +CONF_RSSI = "rssi" +CONF_LQI = "lqi" + +cc1101_ns = cg.esphome_ns.namespace("cc1101") +CC1101 = cc1101_ns.class_("CC1101", cg.PollingComponent, spi.SPIDevice) + +BeginTxAction = cc1101_ns.class_("BeginTxAction", automation.Action) +EndTxAction = cc1101_ns.class_("EndTxAction", automation.Action) + +CONFIG_SCHEMA = ( + cv.Schema( + { + cv.GenerateID(): cv.declare_id(CC1101), + cv.Optional(CONF_GDO0): pins.gpio_output_pin_schema, + cv.Optional(CONF_BANDWIDTH, default=200): cv.uint32_t, + cv.Optional(CONF_FREQUENCY, default=433920): cv.uint32_t, + cv.Optional(CONF_RSSI): sensor.sensor_schema( + unit_of_measurement=UNIT_DECIBEL_MILLIWATT, + accuracy_decimals=0, + device_class=DEVICE_CLASS_SIGNAL_STRENGTH, + state_class=STATE_CLASS_MEASUREMENT, + ), + cv.Optional(CONF_LQI): sensor.sensor_schema( + unit_of_measurement=UNIT_EMPTY, + accuracy_decimals=0, + state_class=STATE_CLASS_MEASUREMENT, + ), + } + ) + .extend(cv.polling_component_schema("60s")) + .extend(spi.spi_device_schema(cs_pin_required=True)) +) + +CC1101_ACTION_SCHEMA = maybe_simple_id( + { + cv.Required(CONF_ID): cv.use_id(CC1101), + } +) + + +@automation.register_action("cc1101.begin_tx", BeginTxAction, CC1101_ACTION_SCHEMA) +@automation.register_action("cc1101.end_tx", EndTxAction, CC1101_ACTION_SCHEMA) +async def cc1101_action_to_code(config, action_id, template_arg, args): + var = cg.new_Pvariable(action_id, template_arg) + await cg.register_parented(var, config[CONF_ID]) + return var + + +async def to_code(config): + var = cg.new_Pvariable(config[CONF_ID]) + await cg.register_component(var, config) + await spi.register_spi_device(var, config) + + if CONF_GDO0 in config: + gdo0 = await cg.gpio_pin_expression(config[CONF_GDO0]) + cg.add(var.set_config_gdo0(gdo0)) + cg.add(var.set_config_bandwidth(config[CONF_BANDWIDTH])) + cg.add(var.set_config_frequency(config[CONF_FREQUENCY])) + if CONF_RSSI in config: + rssi = await sensor.new_sensor(config[CONF_RSSI]) + cg.add(var.set_config_rssi_sensor(rssi)) + if CONF_LQI in config: + lqi = await sensor.new_sensor(config[CONF_LQI]) + cg.add(var.set_config_lqi_sensor(lqi)) diff --git a/esphome/components/cc1101/cc1101.h b/esphome/components/cc1101/cc1101.h index e4d2e5e1a5..db0179b361 100644 --- a/esphome/components/cc1101/cc1101.h +++ b/esphome/components/cc1101/cc1101.h @@ -7,8 +7,7 @@ namespace esphome { namespace cc1101 { -class CC1101 : public sensor::Sensor, - public PollingComponent, +class CC1101 : public PollingComponent, public spi::SPIDevice { protected: diff --git a/esphome/components/cc1101/sensor.py b/esphome/components/cc1101/sensor.py deleted file mode 100644 index 3cc8626219..0000000000 --- a/esphome/components/cc1101/sensor.py +++ /dev/null @@ -1,84 +0,0 @@ -import esphome.codegen as cg -import esphome.config_validation as cv -from esphome import automation, pins -from esphome.components import sensor -from esphome.components import spi -from esphome.automation import maybe_simple_id -from esphome.const import ( - CONF_ID, - CONF_FREQUENCY, - UNIT_EMPTY, - UNIT_DECIBEL_MILLIWATT, - DEVICE_CLASS_SIGNAL_STRENGTH, - STATE_CLASS_MEASUREMENT, -) - -DEPENDENCIES = ["spi"] - -CONF_GDO0 = "gdo0" -CONF_BANDWIDTH = "bandwidth" -# CONF_FREQUENCY = "frequency" -CONF_RSSI = "rssi" -CONF_LQI = "lqi" - -cc1101_ns = cg.esphome_ns.namespace("cc1101") -CC1101 = cc1101_ns.class_("CC1101", sensor.Sensor, cg.PollingComponent, spi.SPIDevice) - -BeginTxAction = cc1101_ns.class_("BeginTxAction", automation.Action) -EndTxAction = cc1101_ns.class_("EndTxAction", automation.Action) - -CONFIG_SCHEMA = ( - cv.Schema( - { - cv.GenerateID(): cv.declare_id(CC1101), - cv.Optional(CONF_GDO0): pins.gpio_output_pin_schema, - cv.Optional(CONF_BANDWIDTH, default=200): cv.uint32_t, - cv.Optional(CONF_FREQUENCY, default=433920): cv.uint32_t, - cv.Optional(CONF_RSSI): sensor.sensor_schema( - unit_of_measurement=UNIT_DECIBEL_MILLIWATT, - accuracy_decimals=0, - device_class=DEVICE_CLASS_SIGNAL_STRENGTH, - state_class=STATE_CLASS_MEASUREMENT, - ), - cv.Optional(CONF_LQI): sensor.sensor_schema( - unit_of_measurement=UNIT_EMPTY, - accuracy_decimals=0, - state_class=STATE_CLASS_MEASUREMENT, - ), - } - ) - .extend(cv.polling_component_schema("60s")) - .extend(spi.spi_device_schema(cs_pin_required=True)) -) - -CC1101_ACTION_SCHEMA = maybe_simple_id( - { - cv.Required(CONF_ID): cv.use_id(CC1101), - } -) - - -@automation.register_action("cc1101.begin_tx", BeginTxAction, CC1101_ACTION_SCHEMA) -@automation.register_action("cc1101.end_tx", EndTxAction, CC1101_ACTION_SCHEMA) -async def cc1101_action_to_code(config, action_id, template_arg, args): - var = cg.new_Pvariable(action_id, template_arg) - await cg.register_parented(var, config[CONF_ID]) - return var - - -async def to_code(config): - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await spi.register_spi_device(var, config) - - if CONF_GDO0 in config: - gdo0 = await cg.gpio_pin_expression(config[CONF_GDO0]) - cg.add(var.set_config_gdo0(gdo0)) - cg.add(var.set_config_bandwidth(config[CONF_BANDWIDTH])) - cg.add(var.set_config_frequency(config[CONF_FREQUENCY])) - if CONF_RSSI in config: - rssi = await sensor.new_sensor(config[CONF_RSSI]) - cg.add(var.set_config_rssi_sensor(rssi)) - if CONF_LQI in config: - lqi = await sensor.new_sensor(config[CONF_LQI]) - cg.add(var.set_config_lqi_sensor(lqi))