Introduced a HUB component + front panel IRQ handling
A HUB component was introduced. This HUB component has all the knowledge
about the Yeelight Bedside Lamp 2 hardware. It known what pins are used,
that PWM frequencies to use, what pins to switch in binary mode, etc. etc.
No configuration is required for this HUB component. It's automatically
loaded when the light component is loaded. The light component will use the
HUB component to access the pins that are required for driving the LED
circuitry.
Note that this simplifies the configuration by A LOT. There's no need
anymore to configure the pinouts in the YAML file. This is a logical route
to take, since we're talking about a factory-produced PCB with a soldered on
ESP32 chip, which uses the same GPIO's and settings on all produced devices
(I presume). It would be quite redundant to force every user into
configuring these pinouts themselves.
** Beware to update your device yaml configuration **
There are a few pinouts left to move into the HUB. I will do that in the
next commit. Your device yaml configuration can be simplified along with
these changes. Some of the keys in the existing light configuration block
will no longer work and will have to be removed (red, green, blue, white).
** Further development **
The HUB will be extended make it the central component that also handles
the I2C communication. This way, there is a central place to regulate the
traffic to and from the front panel. We will be able to build upon this
by implementing extra, fully separated components that handle for example
the front panel light level, the power button, the color button and
the slider.
** Interrupt handler for the I2C IRQ trigger pin **
One requirement for the I2C communication has already been implemented: an
interrupt handler for the GPIO that is used by the front panel to signal the
ESP that a new touch or release event is avilable to be read.
It doens't do anything functionally right now, but if you watch the log
file, you will see that touch events are detected and that they trigger some
log messages.
3 years ago Introduced a HUB component + front panel IRQ handling
A HUB component was introduced. This HUB component has all the knowledge
about the Yeelight Bedside Lamp 2 hardware. It known what pins are used,
that PWM frequencies to use, what pins to switch in binary mode, etc. etc.
No configuration is required for this HUB component. It's automatically
loaded when the light component is loaded. The light component will use the
HUB component to access the pins that are required for driving the LED
circuitry.
Note that this simplifies the configuration by A LOT. There's no need
anymore to configure the pinouts in the YAML file. This is a logical route
to take, since we're talking about a factory-produced PCB with a soldered on
ESP32 chip, which uses the same GPIO's and settings on all produced devices
(I presume). It would be quite redundant to force every user into
configuring these pinouts themselves.
** Beware to update your device yaml configuration **
There are a few pinouts left to move into the HUB. I will do that in the
next commit. Your device yaml configuration can be simplified along with
these changes. Some of the keys in the existing light configuration block
will no longer work and will have to be removed (red, green, blue, white).
** Further development **
The HUB will be extended make it the central component that also handles
the I2C communication. This way, there is a central place to regulate the
traffic to and from the front panel. We will be able to build upon this
by implementing extra, fully separated components that handle for example
the front panel light level, the power button, the color button and
the slider.
** Interrupt handler for the I2C IRQ trigger pin **
One requirement for the I2C communication has already been implemented: an
interrupt handler for the GPIO that is used by the front panel to signal the
ESP that a new touch or release event is avilable to be read.
It doens't do anything functionally right now, but if you watch the log
file, you will see that touch events are detected and that they trigger some
log messages.
3 years ago Introduced a HUB component + front panel IRQ handling
A HUB component was introduced. This HUB component has all the knowledge
about the Yeelight Bedside Lamp 2 hardware. It known what pins are used,
that PWM frequencies to use, what pins to switch in binary mode, etc. etc.
No configuration is required for this HUB component. It's automatically
loaded when the light component is loaded. The light component will use the
HUB component to access the pins that are required for driving the LED
circuitry.
Note that this simplifies the configuration by A LOT. There's no need
anymore to configure the pinouts in the YAML file. This is a logical route
to take, since we're talking about a factory-produced PCB with a soldered on
ESP32 chip, which uses the same GPIO's and settings on all produced devices
(I presume). It would be quite redundant to force every user into
configuring these pinouts themselves.
** Beware to update your device yaml configuration **
There are a few pinouts left to move into the HUB. I will do that in the
next commit. Your device yaml configuration can be simplified along with
these changes. Some of the keys in the existing light configuration block
will no longer work and will have to be removed (red, green, blue, white).
** Further development **
The HUB will be extended make it the central component that also handles
the I2C communication. This way, there is a central place to regulate the
traffic to and from the front panel. We will be able to build upon this
by implementing extra, fully separated components that handle for example
the front panel light level, the power button, the color button and
the slider.
** Interrupt handler for the I2C IRQ trigger pin **
One requirement for the I2C communication has already been implemented: an
interrupt handler for the GPIO that is used by the front panel to signal the
ESP that a new touch or release event is avilable to be read.
It doens't do anything functionally right now, but if you watch the log
file, you will see that touch events are detected and that they trigger some
log messages.
3 years ago Introduced a HUB component + front panel IRQ handling
A HUB component was introduced. This HUB component has all the knowledge
about the Yeelight Bedside Lamp 2 hardware. It known what pins are used,
that PWM frequencies to use, what pins to switch in binary mode, etc. etc.
No configuration is required for this HUB component. It's automatically
loaded when the light component is loaded. The light component will use the
HUB component to access the pins that are required for driving the LED
circuitry.
Note that this simplifies the configuration by A LOT. There's no need
anymore to configure the pinouts in the YAML file. This is a logical route
to take, since we're talking about a factory-produced PCB with a soldered on
ESP32 chip, which uses the same GPIO's and settings on all produced devices
(I presume). It would be quite redundant to force every user into
configuring these pinouts themselves.
** Beware to update your device yaml configuration **
There are a few pinouts left to move into the HUB. I will do that in the
next commit. Your device yaml configuration can be simplified along with
these changes. Some of the keys in the existing light configuration block
will no longer work and will have to be removed (red, green, blue, white).
** Further development **
The HUB will be extended make it the central component that also handles
the I2C communication. This way, there is a central place to regulate the
traffic to and from the front panel. We will be able to build upon this
by implementing extra, fully separated components that handle for example
the front panel light level, the power button, the color button and
the slider.
** Interrupt handler for the I2C IRQ trigger pin **
One requirement for the I2C communication has already been implemented: an
interrupt handler for the GPIO that is used by the front panel to signal the
ESP that a new touch or release event is avilable to be read.
It doens't do anything functionally right now, but if you watch the log
file, you will see that touch events are detected and that they trigger some
log messages.
3 years ago Introduced a HUB component + front panel IRQ handling
A HUB component was introduced. This HUB component has all the knowledge
about the Yeelight Bedside Lamp 2 hardware. It known what pins are used,
that PWM frequencies to use, what pins to switch in binary mode, etc. etc.
No configuration is required for this HUB component. It's automatically
loaded when the light component is loaded. The light component will use the
HUB component to access the pins that are required for driving the LED
circuitry.
Note that this simplifies the configuration by A LOT. There's no need
anymore to configure the pinouts in the YAML file. This is a logical route
to take, since we're talking about a factory-produced PCB with a soldered on
ESP32 chip, which uses the same GPIO's and settings on all produced devices
(I presume). It would be quite redundant to force every user into
configuring these pinouts themselves.
** Beware to update your device yaml configuration **
There are a few pinouts left to move into the HUB. I will do that in the
next commit. Your device yaml configuration can be simplified along with
these changes. Some of the keys in the existing light configuration block
will no longer work and will have to be removed (red, green, blue, white).
** Further development **
The HUB will be extended make it the central component that also handles
the I2C communication. This way, there is a central place to regulate the
traffic to and from the front panel. We will be able to build upon this
by implementing extra, fully separated components that handle for example
the front panel light level, the power button, the color button and
the slider.
** Interrupt handler for the I2C IRQ trigger pin **
One requirement for the I2C communication has already been implemented: an
interrupt handler for the GPIO that is used by the front panel to signal the
ESP that a new touch or release event is avilable to be read.
It doens't do anything functionally right now, but if you watch the log
file, you will see that touch events are detected and that they trigger some
log messages.
3 years ago |
|
- #pragma once
-
- #include "../common.h"
- #include "../yeelight_bs2_hub.h"
- #include "color_instant_handler.h"
- #include "color_transition_handler.h"
- #include "esphome/components/ledc/ledc_output.h"
-
- namespace esphome {
- namespace yeelight {
- namespace bs2 {
-
- /**
- * A LightOutput class for the Yeelight Bedside Lamp 2.
- *
- * The function of this class is to translate a required light state
- * into actual physicial GPIO output signals to drive the device's LED
- * circuitry. It forms the glue between the physical device and the
- * logical light color input.
- */
- class YeelightBS2LightOutput : public Component, public light::LightOutput {
- public:
- /** Sets the Yeelight BS2 hub component. */
- void set_hub(YeelightBS2Hub *hub) { hub_ = hub; }
-
- /**
- * Sets the first GPIO binary output, used as internal master switch for
- * the LED light circuitry.
- */
- void set_master1_output(gpio::GPIOBinaryOutput *master1) { master1_ = master1; }
-
- /**
- * Set the second GPIO binary output, used as internal master switch for
- * the LED light circuitry.
- */
- void set_master2_output(gpio::GPIOBinaryOutput *master2) { master2_ = master2; }
-
- /**
- * Returns a LightTraits object, which is used to explain to the outside
- * world (e.g. Home Assistant) what features are supported by this device.
- */
- light::LightTraits get_traits() override
- {
- auto traits = light::LightTraits();
- traits.set_supports_rgb(true);
- traits.set_supports_color_temperature(true);
- traits.set_supports_brightness(true);
- traits.set_supports_rgb_white_value(false);
- traits.set_supports_color_interlock(true);
- traits.set_min_mireds(MIRED_MIN);
- traits.set_max_mireds(MIRED_MAX);
- return traits;
- }
-
- void add_on_state_callback(std::function<void(light::LightColorValues)> &&callback) {
- this->state_callback_.add(std::move(callback));
- }
-
- /**
- * Applies a requested light state to the physicial GPIO outputs.
- */
- void write_state(light::LightState *state)
- {
- auto values = state->current_values;
-
- // The color must either be set instantly, or the color is
- // transitioning to an end color. The transition handler will do its
- // own inspection to see if a transition is currently active or not.
- // Based on the outcome, use either the instant or transition handler.
- GPIOOutputs *delegate;
- if (transition_handler_->set_light_color_values(values)) {
- delegate = transition_handler_;
- } else {
- instant_handler_->set_light_color_values(values);
- delegate = instant_handler_;
- }
-
- // Note: one might think that it is more logical to turn on the LED
- // circuitry master switch after setting the individual channels,
- // but this is the order that was used by the original firmware. I
- // tried to stay as close as possible to the original behavior, so
- // that's why these GPIOs are turned on at this point.
- if (values.get_state() != 0)
- {
- master2_->turn_on();
- master1_->turn_on();
- }
-
- // Apply the current GPIO output levels from the selected handler.
- hub_->red->set_level(delegate->red);
- hub_->green->set_level(delegate->green);
- hub_->blue->set_level(delegate->blue);
- hub_->white->set_level(delegate->white);
-
- if (values.get_state() == 0)
- {
- master2_->turn_off();
- master1_->turn_off();
- }
-
- this->state_callback_.call(values);
- }
-
- protected:
- YeelightBS2Hub *hub_;
- esphome::gpio::GPIOBinaryOutput *master1_;
- esphome::gpio::GPIOBinaryOutput *master2_;
- GPIOOutputs *transition_handler_;
- GPIOOutputs *instant_handler_ = new ColorInstantHandler();
- CallbackManager<void(light::LightColorValues)> state_callback_{};
-
- friend class YeelightBS2LightState;
-
- /**
- * Called by the YeelightBS2LightState class, to set the object that can be
- * used to access the protected LightTransformer data from the LightState
- * object.
- */
- void set_transformer_inspector(LightStateTransformerInspector *exposer) {
- transition_handler_ = new ColorTransitionHandler(exposer);
- }
- };
-
- /**
- * This custom LightState class is used to provide access to the protected
- * LightTranformer information in the LightState class.
- *
- * This class is used by the ColorTransitionHandler class to inspect if
- * an ongoing light color transition is active in a LightState object.
- */
- class YeelightBS2LightState : public light::LightState, public LightStateTransformerInspector
- {
- public:
- YeelightBS2LightState(const std::string &name, YeelightBS2LightOutput *output) : light::LightState(name, output) {
- output->set_transformer_inspector(this);
- }
-
- bool is_active() { return this->transformer_ != nullptr; }
- bool is_transition() { return this->transformer_->is_transition(); }
- light::LightColorValues get_end_values() { return this->transformer_->get_end_values(); }
- float get_progress() { return this->transformer_->get_progress(); }
- };
-
- } // namespace bs2
- } // namespace yeelight
- } // namespace esphome
|