From 27ebdc6e7aba8a56799f00df251ab08398be197c Mon Sep 17 00:00:00 2001 From: Oliver Kleinecke Date: Sat, 15 Feb 2025 21:03:47 +0100 Subject: [PATCH] refactor: rename dynamic_lamp_component namespace to dynamic_lamp for consistency --- esphome/components/dynamic_lamp/__init__.py | 3 +-- esphome/components/dynamic_lamp/dynamic_lamp.cpp | 4 ++-- esphome/components/dynamic_lamp/dynamic_lamp.h | 4 ++-- esphome/components/dynamic_lamp/output/__init__.py | 3 +-- .../components/dynamic_lamp/output/dynamic_lamp_output.cpp | 4 ++-- esphome/components/dynamic_lamp/output/dynamic_lamp_output.h | 4 ++-- 6 files changed, 10 insertions(+), 12 deletions(-) diff --git a/esphome/components/dynamic_lamp/__init__.py b/esphome/components/dynamic_lamp/__init__.py index b61a7dbcf4..1dc78a8206 100644 --- a/esphome/components/dynamic_lamp/__init__.py +++ b/esphome/components/dynamic_lamp/__init__.py @@ -6,11 +6,10 @@ from esphome.const import CONF_ID CODEOWNERS = ["@p1ngb4ck"] MULTI_CONF = False -dynamic_lamp_ns = cg.esphome_ns.namespace('dynamic_lamp_component') +dynamic_lamp_ns = cg.esphome_ns.namespace('dynamic_lamp') DynamicLampComponent = dynamic_lamp_ns.class_('DynamicLampComponent', cg.Component) CONF_DYNAMIC_LAMP_ID = "dynamic_lamp_id" - CONF_SAVE_MODE = 'save_mode' CONF_AVAILABLE_OUTPUTS = 'available_outputs' CONFIG_SCHEMA = cv.Schema({ diff --git a/esphome/components/dynamic_lamp/dynamic_lamp.cpp b/esphome/components/dynamic_lamp/dynamic_lamp.cpp index 6796f67d49..3ea0dd0db8 100644 --- a/esphome/components/dynamic_lamp/dynamic_lamp.cpp +++ b/esphome/components/dynamic_lamp/dynamic_lamp.cpp @@ -12,7 +12,7 @@ #include namespace esphome { -namespace dynamic_lamp_component { +namespace dynamic_lamp { static const char *TAG = "dynamic_lamp"; @@ -237,5 +237,5 @@ void DynamicLampComponent::restore_lamp_values_(uint8_t lamp_number) { this->active_lamps_[lamp_number].active = false; } -} // namespace dynamic_lamp_component +} // namespace dynamic_lamp } // namespace esphome diff --git a/esphome/components/dynamic_lamp/dynamic_lamp.h b/esphome/components/dynamic_lamp/dynamic_lamp.h index eb6b63503b..5ef7bdfa59 100644 --- a/esphome/components/dynamic_lamp/dynamic_lamp.h +++ b/esphome/components/dynamic_lamp/dynamic_lamp.h @@ -5,7 +5,7 @@ #include "esphome/components/light/light_output.h" namespace esphome { -namespace dynamic_lamp_component { +namespace dynamic_lamp { enum SupportedSaveModes : uint8_t { SAVE_MODE_NONE = 0, @@ -93,5 +93,5 @@ class DynamicLampComponent : public Component { }; -} // namespace dynamic_lamp_component +} // namespace dynamic_lamp } // namespace esphome diff --git a/esphome/components/dynamic_lamp/output/__init__.py b/esphome/components/dynamic_lamp/output/__init__.py index 1ba7e35781..a5925d90f6 100644 --- a/esphome/components/dynamic_lamp/output/__init__.py +++ b/esphome/components/dynamic_lamp/output/__init__.py @@ -7,8 +7,7 @@ from .. import CONF_DYNAMIC_LAMP_ID, DynamicLampComponent, dynamic_lamp_ns DEPENDENCIES = ["dynamic_lamp"] -dynamic_monochromatic_ns = cg.esphome_ns.namespace("dynamic_monochromatic_light") -DynamicLamp = dynamic_monochromatic_ns.class_( +DynamicLamp = dynamic_lamp_ns.class_( "DynamicLamp", light.LightOutput, cg.Parented.template(DynamicLampComponent) ) diff --git a/esphome/components/dynamic_lamp/output/dynamic_lamp_output.cpp b/esphome/components/dynamic_lamp/output/dynamic_lamp_output.cpp index 2d1975ffac..24e41f9e53 100644 --- a/esphome/components/dynamic_lamp/output/dynamic_lamp_output.cpp +++ b/esphome/components/dynamic_lamp/output/dynamic_lamp_output.cpp @@ -1,7 +1,7 @@ #include "dynamic_lamp_output.h" namespace esphome { -namespace dynamic_monochromatic_light { +namespace dynamic_lamp { void DynamicLamp::write_state(light::LightState *state) override { float bright; @@ -11,5 +11,5 @@ void DynamicLamp::write_state(light::LightState *state) override { } } -} // namespace dynamic_monochromatic_light +} // namespace dynamic_lamp } // namespace esphome diff --git a/esphome/components/dynamic_lamp/output/dynamic_lamp_output.h b/esphome/components/dynamic_lamp/output/dynamic_lamp_output.h index d4be67d3c5..06fba47d96 100644 --- a/esphome/components/dynamic_lamp/output/dynamic_lamp_output.h +++ b/esphome/components/dynamic_lamp/output/dynamic_lamp_output.h @@ -3,7 +3,7 @@ #include "../dynamic_lamp.h" namespace esphome { -namespace dynamic_monochromatic_light { +namespace dynamic_lamp { class DynamicLamp : public light::LightOutput, public Parented { public: @@ -21,5 +21,5 @@ class DynamicLamp : public light::LightOutput, public Parented