Added custom class for sensor

This commit is contained in:
ElVit
2025-02-09 17:20:45 +01:00
parent b3f11ba0dd
commit 80a825199e
10 changed files with 160 additions and 96 deletions
+5 -7
View File
@@ -92,10 +92,8 @@ CONFIG_SCHEMA = cv.Schema(
async def to_code(config):
hub = await cg.get_variable(config[CONF_MAIDSITE_DESK_ID])
for key in TYPES:
await setup_conf(config, key, hub)
async def setup_conf(parent_config, key, hub):
if child_config := parent_config.get(key):
var = await button.new_button(child_config)
await cg.register_parented(var, parent_config[CONF_MAIDSITE_DESK_ID])
cg.add(getattr(hub, f"set_{key}_button")(var))
if child_config := config.get(key):
var = await button.new_button(child_config)
await cg.register_component(var, child_config)
await cg.register_parented(var, config[CONF_MAIDSITE_DESK_ID])
cg.add(getattr(hub, f"set_{key}_button")(var))
@@ -1,10 +1,18 @@
#include "maidsite_desk_button.h"
#include "esphome/core/log.h"
namespace esphome
{
namespace maidsite_desk
{
static const char *const TAG = "maidsite_desk.button";
void MaidsiteDeskButton::dump_config()
{
LOG_BUTTON("", "Maidsite Desk Button", this);
}
void MaidsiteDeskButton::press_action()
{
this->parent_->button_press_action(this);
@@ -1,5 +1,6 @@
#pragma once
#include "esphome/components/button/button.h"
#include "esphome/core/component.h"
#include "../maidsite_desk.h"
@@ -7,10 +8,12 @@ namespace esphome
{
namespace maidsite_desk
{
class MaidsiteDeskComponent;
class MaidsiteDeskButton : public button::Button, public Parented<MaidsiteDeskComponent>
{
public:
MaidsiteDeskButton() = default;
void dump_config() override;
protected:
void press_action() override;
+10 -7
View File
@@ -41,10 +41,13 @@ CONFIG_SCHEMA = cv.Schema(
async def to_code(config):
hub = await cg.get_variable(config[CONF_MAIDSITE_DESK_ID])
for index, key in enumerate(TYPES):
await setup_conf(config, key, index, hub)
async def setup_conf(parent_config, key, index, hub):
if child_config := parent_config.get(key):
var = await number.new_number(child_config, min_value=CONF_NUMBERS[index][0], max_value=CONF_NUMBERS[index][1], step=CONF_NUMBERS[index][2])
await cg.register_parented(var, parent_config[CONF_MAIDSITE_DESK_ID])
cg.add(getattr(hub, f"set_{key}_number")(var))
if child_config := config.get(key):
var = await number.new_number(
child_config,
min_value=CONF_NUMBERS[index][0],
max_value=CONF_NUMBERS[index][1],
step=CONF_NUMBERS[index][2]
)
await cg.register_component(var, child_config)
await cg.register_parented(var, config[CONF_MAIDSITE_DESK_ID])
cg.add(getattr(hub, f"set_{key}_number")(var))
@@ -1,10 +1,18 @@
#include "maidsite_desk_number.h"
#include "esphome/core/log.h"
namespace esphome
{
namespace maidsite_desk
{
static const char *const TAG = "maidsite_desk.number";
void MaidsiteDeskNumber::dump_config()
{
LOG_NUMBER("", "Maidsite Desk Number", this);
}
void MaidsiteDeskNumber::control(float value)
{
this->publish_state(value);
@@ -1,5 +1,6 @@
#pragma once
#include "esphome/components/number/number.h"
#include "esphome/core/component.h"
#include "../maidsite_desk.h"
@@ -7,10 +8,12 @@ namespace esphome
{
namespace maidsite_desk
{
class MaidsiteDeskComponent;
class MaidsiteDeskNumber : public number::Number, public Parented<MaidsiteDeskComponent>
{
public:
MaidsiteDeskNumber() = default;
void dump_config() override;
protected:
void control(float value) override;
-82
View File
@@ -1,82 +0,0 @@
import esphome.codegen as cg
import esphome.config_validation as cv
from esphome.components import sensor
from esphome.const import (
UNIT_CENTIMETER,
UNIT_PERCENT,
)
from . import MaidsiteDeskComponent, CONF_MAIDSITE_DESK_ID
CONF_UNIT = "unit"
CONF_HEIGHT_ABS = "height_abs"
CONF_HEIGHT_PCT = "height_pct"
CONF_HEIGHT_MIN = "height_min"
CONF_HEIGHT_MAX = "height_max"
CONF_POSITION_M1 = "position_m1"
CONF_POSITION_M2 = "position_m2"
CONF_POSITION_M3 = "position_m3"
CONF_POSITION_M4 = "position_m4"
TYPES = [
CONF_UNIT,
CONF_HEIGHT_ABS,
CONF_HEIGHT_PCT,
CONF_HEIGHT_MIN,
CONF_HEIGHT_MAX,
CONF_POSITION_M1,
CONF_POSITION_M2,
CONF_POSITION_M3,
CONF_POSITION_M4,
]
CONFIG_SCHEMA = cv.All(
cv.Schema(
{
cv.GenerateID(CONF_MAIDSITE_DESK_ID): cv.use_id(MaidsiteDeskComponent),
cv.Optional(CONF_UNIT): sensor.sensor_schema(),
cv.Optional(CONF_HEIGHT_ABS): sensor.sensor_schema(
accuracy_decimals=2,
unit_of_measurement=UNIT_CENTIMETER,
),
cv.Optional(CONF_HEIGHT_PCT): sensor.sensor_schema(
accuracy_decimals=2,
unit_of_measurement=UNIT_PERCENT,
),
cv.Optional(CONF_HEIGHT_MIN): sensor.sensor_schema(
accuracy_decimals=2,
unit_of_measurement=UNIT_CENTIMETER,
),
cv.Optional(CONF_HEIGHT_MAX): sensor.sensor_schema(
accuracy_decimals=2,
unit_of_measurement=UNIT_CENTIMETER,
),
cv.Optional(CONF_POSITION_M1): sensor.sensor_schema(
accuracy_decimals=2,
unit_of_measurement=UNIT_CENTIMETER,
),
cv.Optional(CONF_POSITION_M2): sensor.sensor_schema(
accuracy_decimals=2,
unit_of_measurement=UNIT_CENTIMETER,
),
cv.Optional(CONF_POSITION_M3): sensor.sensor_schema(
accuracy_decimals=2,
unit_of_measurement=UNIT_CENTIMETER,
),
cv.Optional(CONF_POSITION_M4): sensor.sensor_schema(
accuracy_decimals=2,
unit_of_measurement=UNIT_CENTIMETER,
),
}
).extend(cv.COMPONENT_SCHEMA)
)
async def to_code(config):
hub = await cg.get_variable(config[CONF_MAIDSITE_DESK_ID])
for key in TYPES:
await setup_conf(config, key, hub)
async def setup_conf(parent_config, key, hub):
if child_config := parent_config.get(key):
var = await sensor.new_sensor(child_config)
cg.add(getattr(hub, f"set_{key}_sensor")(var))
@@ -0,0 +1,88 @@
import esphome.codegen as cg
import esphome.config_validation as cv
from esphome.components import sensor
from esphome.const import (
UNIT_CENTIMETER,
UNIT_PERCENT,
)
from . import CONF_MAIDSITE_DESK_ID, MaidsiteDeskComponent, maidsite_desk_ns
CONF_UNIT = "unit"
CONF_HEIGHT_ABS = "height_abs"
CONF_HEIGHT_PCT = "height_pct"
CONF_HEIGHT_MIN = "height_min"
CONF_HEIGHT_MAX = "height_max"
CONF_POSITION_M1 = "position_m1"
CONF_POSITION_M2 = "position_m2"
CONF_POSITION_M3 = "position_m3"
CONF_POSITION_M4 = "position_m4"
TYPES = [
CONF_UNIT,
CONF_HEIGHT_ABS,
CONF_HEIGHT_PCT,
CONF_HEIGHT_MIN,
CONF_HEIGHT_MAX,
CONF_POSITION_M1,
CONF_POSITION_M2,
CONF_POSITION_M3,
CONF_POSITION_M4,
]
MaidsiteDeskSensor = maidsite_desk_ns.class_("MaidsiteDeskSensor", sensor.Sensor, cg.Component)
CONFIG_SCHEMA = cv.Schema(
{
cv.GenerateID(CONF_MAIDSITE_DESK_ID): cv.use_id(MaidsiteDeskComponent),
cv.Optional(CONF_UNIT): sensor.sensor_schema(),
cv.Optional(CONF_HEIGHT_ABS): sensor.sensor_schema(
MaidsiteDeskSensor,
accuracy_decimals=2,
unit_of_measurement=UNIT_CENTIMETER,
),
cv.Optional(CONF_HEIGHT_PCT): sensor.sensor_schema(
MaidsiteDeskSensor,
accuracy_decimals=2,
unit_of_measurement=UNIT_PERCENT,
),
cv.Optional(CONF_HEIGHT_MIN): sensor.sensor_schema(
MaidsiteDeskSensor,
accuracy_decimals=2,
unit_of_measurement=UNIT_CENTIMETER,
),
cv.Optional(CONF_HEIGHT_MAX): sensor.sensor_schema(
MaidsiteDeskSensor,
accuracy_decimals=2,
unit_of_measurement=UNIT_CENTIMETER,
),
cv.Optional(CONF_POSITION_M1): sensor.sensor_schema(
MaidsiteDeskSensor,
accuracy_decimals=2,
unit_of_measurement=UNIT_CENTIMETER,
),
cv.Optional(CONF_POSITION_M2): sensor.sensor_schema(
MaidsiteDeskSensor,
accuracy_decimals=2,
unit_of_measurement=UNIT_CENTIMETER,
),
cv.Optional(CONF_POSITION_M3): sensor.sensor_schema(
MaidsiteDeskSensor,
accuracy_decimals=2,
unit_of_measurement=UNIT_CENTIMETER,
),
cv.Optional(CONF_POSITION_M4): sensor.sensor_schema(
MaidsiteDeskSensor,
accuracy_decimals=2,
unit_of_measurement=UNIT_CENTIMETER,
),
}
).extend(cv.COMPONENT_SCHEMA)
async def to_code(config):
hub = await cg.get_variable(config[CONF_MAIDSITE_DESK_ID])
for key in TYPES:
if child_config := config.get(key):
var = await sensor.new_sensor(child_config)
cg.add(getattr(hub, f"set_{key}_sensor")(var))
@@ -0,0 +1,16 @@
#include "maidsite_desk_sensor.h"
#include "esphome/core/log.h"
namespace esphome
{
namespace maidsite_desk
{
static const char *const TAG = "maidsite_desk.sensor";
void MaidsiteDeskSensor::dump_config()
{
LOG_SENSOR("", "Maidsite Desk Sensor", this);
}
} // namespace maidsite_desk
} // namespace esphome
@@ -0,0 +1,19 @@
#pragma once
#include "esphome/components/sensor/sensor.h"
#include "esphome/core/component.h"
#include "../maidsite_desk.h"
namespace esphome
{
namespace maidsite_desk
{
class MaidsiteDeskComponent;
class MaidsiteDeskSensor : public sensor::Sensor, public Component, public Parented<MaidsiteDeskComponent>
{
public:
MaidsiteDeskSensor() = default;
void dump_config() override;
};
} // namespace maidsite_desk
} // namespace esphome