From c161a126646fafb65f6c019a74d871777ccf8176 Mon Sep 17 00:00:00 2001
From: Maurice Makaay <mmakaay1@xs4all.net>
Date: Sun, 11 Apr 2021 13:55:16 +0200
Subject: [PATCH] Added a light HAL to the hub component.

---
 light/__init__.py    |  2 +-
 light/light_output.h | 25 ++++++++------------
 yeelight_bs2_hub.h   | 56 ++++++++++++++++++++++++++++++++------------
 3 files changed, 52 insertions(+), 31 deletions(-)

diff --git a/light/__init__.py b/light/__init__.py
index ac5e05e..3e02b9f 100644
--- a/light/__init__.py
+++ b/light/__init__.py
@@ -35,7 +35,7 @@ def to_code(config):
     yield light.register_light(var, config)
 
     hub_var = yield cg.get_variable(config[CONF_HUB_ID])
-    cg.add(var.set_hub(hub_var))
+    cg.add(var.set_hal(hub_var))
 
     for conf in config.get(CONF_ON_BRIGHTNESS, []):
         trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], var)
diff --git a/light/light_output.h b/light/light_output.h
index 2a4d3ce..b044cdf 100644
--- a/light/light_output.h
+++ b/light/light_output.h
@@ -20,8 +20,7 @@ namespace bs2 {
  */
 class YeelightBS2LightOutput : public Component, public light::LightOutput {
 public:
-    /** Sets the Yeelight BS2 hub component. */ 
-    void set_hub(YeelightBS2Hub *hub) { hub_ = hub; }
+    void set_hal(LightHAL *hal) { hal_ = hal; }
 
     /**
      * Returns a LightTraits object, which is used to explain to the outside
@@ -69,28 +68,24 @@ public:
         // 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)
-        {
-            hub_->master2->turn_on();
-            hub_->master1->turn_on();
-        }
+            hal_->light_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);
+        hal_->light_set_rgbw(
+            delegate->red,
+            delegate->green,
+            delegate->blue,
+            delegate->white
+        );
 
         if (values.get_state() == 0)
-        {
-            hub_->master2->turn_off();
-            hub_->master1->turn_off();
-        }
+            hal_->light_turn_off();
 
         this->state_callback_.call(values);
     }
 
 protected:
-    YeelightBS2Hub *hub_;
+    LightHAL *hal_;
     GPIOOutputs *transition_handler_;
     GPIOOutputs *instant_handler_ = new ColorInstantHandler();
     CallbackManager<void(light::LightColorValues)> state_callback_{};
diff --git a/yeelight_bs2_hub.h b/yeelight_bs2_hub.h
index 354b486..400d89c 100644
--- a/yeelight_bs2_hub.h
+++ b/yeelight_bs2_hub.h
@@ -29,23 +29,22 @@ void ICACHE_RAM_ATTR HOT TriggerPinStore::isr(TriggerPinStore *store) {
     store->queue_length++;
 }
 
-class YeelightBS2Hub : public Component {
+class LightHAL {
 public:
-    // Pins that are used for the RGBWW light.
-    ledc::LEDCOutput *red;
-    ledc::LEDCOutput *green;
-    ledc::LEDCOutput *blue;
-    ledc::LEDCOutput *white;
-    gpio::GPIOBinaryOutput *master1;
-    gpio::GPIOBinaryOutput *master2;
+    virtual void light_turn_on() = 0;
+    virtual void light_turn_off() = 0;
+    virtual void light_set_rgbw(float r, float g, float b, float w) = 0;
+};
 
+class YeelightBS2Hub : public Component, public LightHAL {
+public:
     void set_trigger_pin(GPIOPin *pin) { i2c_trigger_pin_ = pin; }
-    void set_red_pin(ledc::LEDCOutput *pin) { red = pin; }
-    void set_green_pin(ledc::LEDCOutput *pin) { green = pin; }
-    void set_blue_pin(ledc::LEDCOutput *pin) { blue = pin; }
-    void set_white_pin(ledc::LEDCOutput *pin) { white = pin; }
-    void set_master1_pin(gpio::GPIOBinaryOutput *pin) { master1 = pin; }
-    void set_master2_pin(gpio::GPIOBinaryOutput *pin) { master2 = pin; }
+    void set_red_pin(ledc::LEDCOutput *pin) { red_ = pin; }
+    void set_green_pin(ledc::LEDCOutput *pin) { green_ = pin; }
+    void set_blue_pin(ledc::LEDCOutput *pin) { blue_ = pin; }
+    void set_white_pin(ledc::LEDCOutput *pin) { white_ = pin; }
+    void set_master1_pin(gpio::GPIOBinaryOutput *pin) { master1_ = pin; }
+    void set_master2_pin(gpio::GPIOBinaryOutput *pin) { master2_ = pin; }
     void set_front_panel_i2c(i2c::I2CComponent *fp_i2c) { fp_i2c_ = fp_i2c; }
 
     void setup() {
@@ -69,7 +68,32 @@ public:
         }
     }
 
+    void light_turn_on() {
+        master1_->turn_on();
+        master2_->turn_on();
+    }
+
+    void light_turn_off() {
+        master1_->turn_off();
+        master2_->turn_off();
+    }
+
+    void light_set_rgbw(float r, float g, float b, float w) {
+        red_->set_level(r);
+        green_->set_level(g);
+        blue_->set_level(b);
+        white_->set_level(w);
+    }
+
 protected:
+    // Pins that are used for the RGBWW LEDs.
+    ledc::LEDCOutput *red_;
+    ledc::LEDCOutput *green_;
+    ledc::LEDCOutput *blue_;
+    ledc::LEDCOutput *white_;
+    gpio::GPIOBinaryOutput *master1_;
+    gpio::GPIOBinaryOutput *master2_;
+
     // Pin that is used by the front panel to notify the ESP that
     // a touch/release event can be read using I2C.
     GPIOPin *i2c_trigger_pin_;
@@ -80,8 +104,10 @@ protected:
     // Fields that are used for trigger pin interrupt handling.
     int counter_ = 0;
     TriggerPinStore trigger_pin_store_{};
+
+    friend class LightHAL;
 };
-    
+
 } // namespace bs2
 } // namespace yeelight
 } // namespace esphome