sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-10-01 17:42:22 +01:00
Code Issues Releases Wiki Activity

feat: integrate RealTimeClock into DynamicLampComponent for enhanced time management

Browse Source
This commit is contained in:
Oliver Kleinecke
2025-02-18 10:53:13 +01:00
parent 2d5cdf2c26
commit 762d40c570
3 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,6 @@
import esphome.codegen as cg import esphome.codegen as cg
from esphome.components import output from esphome.components import output
from esphome.components.time import RealTimeClock
import esphome.config_validation as cv import esphome.config_validation as cv
from esphome.const import CONF_ID 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) DynamicLampComponent = dynamic_lamp_ns.class_('DynamicLampComponent', cg.Component)
CONF_DYNAMIC_LAMP_ID = "dynamic_lamp_id" CONF_DYNAMIC_LAMP_ID = "dynamic_lamp_id"
CONF_RTC = 'rtc'
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(CONF_ID): cv.declare_id(DynamicLampComponent), 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.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)
async def to_code(config): 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) await cg.register_component(var, config)
for outputPointer in config.get(CONF_AVAILABLE_OUTPUTS, []): for outputPointer in config.get(CONF_AVAILABLE_OUTPUTS, []):
idstr_ = str(outputPointer) idstr_ = str(outputPointer)

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

@@ -244,7 +244,7 @@ bool DynamicLampComponent::add_timer(std::string lamp_name, bool timer_active, u
new_timer.friday = friday; new_timer.friday = friday;
new_timer.saturday = saturday; new_timer.saturday = saturday;
new_timer.sunday = sunday; new_timer.sunday = sunday;
ESPTime now = this->time_->now(); ESPTime now = this->rtc_->now();
time_t begin_date = now.to_time_t(); time_t begin_date = now.to_time_t();
time_t end_date = now.increment_days(1).to_time_t(); time_t end_date = now.increment_days(1).to_time_t();
new_timer.begin_date = begin_date; new_timer.begin_date = begin_date;

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

@@ -80,14 +80,15 @@ struct DynamicLampTimer {
bool saturday : 1; bool saturday : 1;
bool sunday : 1; bool sunday : 1;
unsigned char :0; unsigned char :0;
ESPTime begin_date : 64; time_t begin_date : 64;
ESPTime end_date : 64; time_t end_date : 64;
}; };
class DynamicLamp; class DynamicLamp;
class DynamicLampComponent : public Component { class DynamicLampComponent : public Component {
public: public:
explicit DynamicLampComponent(time::RealTimeClock *rtc) : rtc_(rtc) {}
void setup() override; void setup() override;
void loop() override; void loop() override;
void dump_config() override; void dump_config() override;
@@ -107,6 +108,7 @@ class DynamicLampComponent : public Component {
protected: protected:
friend class DynamicLamp; friend class DynamicLamp;
time::RealTimeClock *rtc_;
void restore_lamp_values_(uint8_t lamp_number); 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); 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); bool write_state_(uint8_t lamp_number, float state);
@@ -115,6 +117,7 @@ class DynamicLampComponent : public Component {
LinkedOutput available_outputs_[16]; LinkedOutput available_outputs_[16];
uint8_t save_mode_; uint8_t save_mode_;
uint8_t lamp_count_ = 0; uint8_t lamp_count_ = 0;
}; };