sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-09-09 14:52:20 +01:00
Code Issues Releases Wiki Activity

refactor: update DynamicLampComponent to support new save modes and integrate with light output

Browse Source
This commit is contained in:
Oliver Kleinecke
2025-02-15 19:45:49 +01:00
parent 85fdb67f6b
commit ee8aff38b2
6 changed files with 25 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
esphome/components/dynamic_lamp/__init__.py
View File

@@ -10,10 +10,11 @@ dynamic_lamp_ns = cg.esphome_ns.namespace('dynamic_lamp')
DynamicLampComponent = dynamic_lamp_ns.class_('DynamicLampComponent', cg.Component) DynamicLampComponent = dynamic_lamp_ns.class_('DynamicLampComponent', cg.Component)
CONF_DYNAMIC_LAMP_ID = "dynamic_lamp_id" CONF_DYNAMIC_LAMP_ID = "dynamic_lamp_id"
CONF_SAVE_MODE = 'save_mode' CONF_SAVE_MODE = 'save_mode'
CONF_AVAILABLE_OUTPUTS = 'available_outputs' CONF_AVAILABLE_OUTPUTS = 'available_outputs'
CONFIG_SCHEMA = cv.Schema({ CONFIG_SCHEMA = cv.Schema({
cv.GenerateID(): cv.declare_id(DynamicLampComponent), cv.GenerateID(CONF_ID): cv.declare_id(DynamicLampComponent),
cv.Required(CONF_AVAILABLE_OUTPUTS): [cv.use_id(output.FloatOutput)], cv.Required(CONF_AVAILABLE_OUTPUTS): [cv.use_id(output.FloatOutput)],
cv.Optional(CONF_SAVE_MODE, default=0): cv.int_range(0, 1), cv.Optional(CONF_SAVE_MODE, default=0): cv.int_range(0, 1),
}).extend(cv.COMPONENT_SCHEMA) }).extend(cv.COMPONENT_SCHEMA)

5
esphome/components/dynamic_lamp/dynamic_lamp.cpp
View File

@@ -97,11 +97,14 @@ void DynamicLampComponent::dump_config() {
case SAVE_MODE_NONE: case SAVE_MODE_NONE:
ESP_LOGCONFIG(TAG, "Save mode set to NONE"); ESP_LOGCONFIG(TAG, "Save mode set to NONE");
break; break;
case SAVE_MODE_LOCAL:
ESP_LOGCONFIG(TAG, "Save mode set to LOCAL");
break;
case SAVE_MODE_FRAM: case SAVE_MODE_FRAM:
ESP_LOGCONFIG(TAG, "Save mode set to FRAM"); ESP_LOGCONFIG(TAG, "Save mode set to FRAM");
break; break;
default: default:
ESP_LOGCONFIG(TAG, "Currently only NONE(0) && FRAM(1) save modes supported, ignoring value %" PRIu8 " and defaulting to NONE!", this->save_mode_); ESP_LOGCONFIG(TAG, "Currently only NONE(0), LOCAL(1) & FRAM(2) save modes supported, ignoring value %" PRIu8 " and defaulting to NONE!", this->save_mode_);
this->save_mode_ = 0; this->save_mode_ = 0;
} }
for (uint8_t i = 0; i < 16; i++) { for (uint8_t i = 0; i < 16; i++) {

3
esphome/components/dynamic_lamp/dynamic_lamp.h
View File

@@ -8,7 +8,8 @@ namespace dynamic_lamp {
enum SupportedSaveModes : uint8_t { enum SupportedSaveModes : uint8_t {
SAVE_MODE_NONE = 0, SAVE_MODE_NONE = 0,
SAVE_MODE_FRAM = 1 SAVE_MODE_LOCAL = 1,
SAVE_MODE_FRAM = 2
}; };
enum LinkedOutputModeIdx : uint8_t { enum LinkedOutputModeIdx : uint8_t {

8
esphome/components/dynamic_lamp/output/__init__.py
View File

@@ -1,5 +1,5 @@
import esphome.codegen as cg import esphome.codegen as cg
from esphome.components import output from esphome.components import light
import esphome.config_validation as cv import esphome.config_validation as cv
from esphome.const import CONF_CHANNEL, CONF_ID from esphome.const import CONF_CHANNEL, CONF_ID
@@ -8,7 +8,7 @@ from .. import CONF_DYNAMIC_LAMP_ID, DynamicLampComponent, dynamic_lamp_ns
DEPENDENCIES = ["dynamic_lamp"] DEPENDENCIES = ["dynamic_lamp"]
DynamicLamp = dynamic_lamp_ns.class_( DynamicLamp = dynamic_lamp_ns.class_(
"DynamicLamp", output.FloatOutput, cg.Parented.template(DynamicLampComponent) "DynamicLamp", light.LightOutput, cg.Parented.template(DynamicLampComponent)
) )
DynamicLampIdx = dynamic_lamp_ns.enum("DynamicLampIdx") DynamicLampIdx = dynamic_lamp_ns.enum("DynamicLampIdx")
@@ -31,7 +31,7 @@ CHANNEL_OPTIONS = {
"P": DynamicLampIdx.LAMP_16, "P": DynamicLampIdx.LAMP_16,
} }
CONFIG_SCHEMA = output.FLOAT_OUTPUT_SCHEMA.extend( CONFIG_SCHEMA = light.BRIGHTNESS_ONLY_LIGHT_SCHEMA.extend(
{ {
cv.Required(CONF_ID): cv.declare_id(DynamicLamp), cv.Required(CONF_ID): cv.declare_id(DynamicLamp),
cv.GenerateID(CONF_DYNAMIC_LAMP_ID): cv.use_id(DynamicLampComponent), cv.GenerateID(CONF_DYNAMIC_LAMP_ID): cv.use_id(DynamicLampComponent),
@@ -47,5 +47,5 @@ async def to_code(config):
parent, parent,
config[CONF_CHANNEL], config[CONF_CHANNEL],
) )
await output.register_output(var, config) await light.register_light(var, config)
await cg.register_parented(var, config[CONF_DYNAMIC_LAMP_ID]) await cg.register_parented(var, config[CONF_DYNAMIC_LAMP_ID])

10
esphome/components/dynamic_lamp/output/dynamic_lamp_output.cpp
View File

@@ -7,11 +7,13 @@ namespace dynamic_lamp {
static const char *const TAG = "dynamic_lamp.output"; static const char *const TAG = "dynamic_lamp.output";
void DynamicLamp::write_state(float state) { void DynamicLamp::write_state(light::LightState *state) override {
if (this->parent_->write_state_(this->lamp_, state)) { float bright;
this->state_ = state; state->current_values_as_brightness(&bright);
if (this->parent_->write_state_(this->lamp_, bright)) {
this->state_ = state;
}
} }
}
} // namespace dynamic_lamp } // namespace dynamic_lamp
} // namespace esphome } // namespace esphome

9
esphome/components/dynamic_lamp/output/dynamic_lamp_output.h
View File

@@ -7,12 +7,17 @@
namespace esphome { namespace esphome {
namespace dynamic_lamp { namespace dynamic_lamp {
class DynamicLamp : public output::FloatOutput, public Parented<DynamicLampComponent> { class DynamicLamp : public light::LightOutput, public Parented<DynamicLampComponent> {
public: public:
DynamicLamp(DynamicLampComponent *parent, DynamicLampIdx lamp) : parent_(parent), lamp_(lamp) {} DynamicLamp(DynamicLampComponent *parent, DynamicLampIdx lamp) : parent_(parent), lamp_(lamp) {}
light::LightTraits get_traits() override {
auto traits = light::LightTraits();
traits.set_supported_color_modes({light::ColorMode::BRIGHTNESS});
return traits;
}
protected: protected:
void write_state(float state) override; void write_state(light::LightState *state) override;
DynamicLampComponent *parent_; DynamicLampComponent *parent_;
DynamicLampIdx lamp_; DynamicLampIdx lamp_;
float state_; float state_;