From 762d40c57079026d459031c7c9ea3d70d2748e0d Mon Sep 17 00:00:00 2001
From: Oliver Kleinecke <kleinecke.oliver@googlemail.com>
Date: Tue, 18 Feb 2025 10:53:13 +0100
Subject: [PATCH] feat: integrate RealTimeClock into DynamicLampComponent for
 enhanced time management

---
 esphome/components/dynamic_lamp/__init__.py      | 8 +++++++-
 esphome/components/dynamic_lamp/dynamic_lamp.cpp | 2 +-
 esphome/components/dynamic_lamp/dynamic_lamp.h   | 7 +++++--
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/esphome/components/dynamic_lamp/__init__.py b/esphome/components/dynamic_lamp/__init__.py
index 1dc78a8206..465d0691f0 100644
--- a/esphome/components/dynamic_lamp/__init__.py
+++ b/esphome/components/dynamic_lamp/__init__.py
@@ -1,5 +1,6 @@
 import esphome.codegen as cg
 from esphome.components import output
+from esphome.components.time import RealTimeClock
 import esphome.config_validation as cv
 from esphome.const import CONF_ID
 
@@ -10,17 +11,22 @@ 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_RTC = 'rtc'
 CONF_SAVE_MODE = 'save_mode'
 CONF_AVAILABLE_OUTPUTS = 'available_outputs'
 CONFIG_SCHEMA = cv.Schema({
     cv.GenerateID(CONF_ID): cv.declare_id(DynamicLampComponent),
+    cv.Required(CONF_RTC): cv.use_id(RealTimeClock),
     cv.Required(CONF_AVAILABLE_OUTPUTS): [cv.use_id(output.FloatOutput)],
     cv.Optional(CONF_SAVE_MODE, default=0): cv.int_range(0, 1),
 }).extend(cv.COMPONENT_SCHEMA)
 
 
 async def to_code(config):
-    var = cg.new_Pvariable(config[CONF_ID])
+    var = cg.new_Pvariable(
+        config[CONF_ID],
+        await cg.get_variable(config[CONF_RTC]),
+    )
     await cg.register_component(var, config)
     for outputPointer in config.get(CONF_AVAILABLE_OUTPUTS, []):
         idstr_ = str(outputPointer)
diff --git a/esphome/components/dynamic_lamp/dynamic_lamp.cpp b/esphome/components/dynamic_lamp/dynamic_lamp.cpp
index 290ae5619f..7ce6f28e17 100644
--- a/esphome/components/dynamic_lamp/dynamic_lamp.cpp
+++ b/esphome/components/dynamic_lamp/dynamic_lamp.cpp
@@ -244,7 +244,7 @@ bool DynamicLampComponent::add_timer(std::string lamp_name, bool timer_active, u
   new_timer.friday = friday;
   new_timer.saturday = saturday;
   new_timer.sunday = sunday;
-  ESPTime now = this->time_->now();
+  ESPTime now = this->rtc_->now();
   time_t begin_date = now.to_time_t();
   time_t end_date = now.increment_days(1).to_time_t();
   new_timer.begin_date = begin_date;
diff --git a/esphome/components/dynamic_lamp/dynamic_lamp.h b/esphome/components/dynamic_lamp/dynamic_lamp.h
index 544d59545b..1f27da8789 100644
--- a/esphome/components/dynamic_lamp/dynamic_lamp.h
+++ b/esphome/components/dynamic_lamp/dynamic_lamp.h
@@ -80,14 +80,15 @@ struct DynamicLampTimer {
   bool saturday : 1;
   bool sunday : 1;
   unsigned char :0;
-  ESPTime begin_date : 64;
-  ESPTime end_date : 64;
+  time_t begin_date : 64;
+  time_t end_date : 64;
 };
 
 class DynamicLamp;
 
 class DynamicLampComponent : public Component {
  public:
+  explicit DynamicLampComponent(time::RealTimeClock *rtc) : rtc_(rtc) {}
   void setup() override;
   void loop() override;
   void dump_config() override;
@@ -107,6 +108,7 @@ class DynamicLampComponent : public Component {
 
  protected:
   friend class DynamicLamp;
+  time::RealTimeClock *rtc_;
   void restore_lamp_values_(uint8_t lamp_number);
   void set_lamp_values_(uint8_t lamp_number, bool active, uint16_t selected_outputs, uint8_t mode, uint8_t mode_value);
   bool write_state_(uint8_t lamp_number, float state);
@@ -115,6 +117,7 @@ class DynamicLampComponent : public Component {
   LinkedOutput available_outputs_[16];
   uint8_t save_mode_;
   uint8_t lamp_count_ = 0;
+
 };