improve blinker

Author: bertmelis

src/Helpers/Blinker.cpp

@@ -15,21 +15,31 @@ Colour blue = {0, 0, 25};
 Colour green = {0, 25, 0};
 Colour red = {25, 0, 0};
 Colour orange = {25, 17, 0};
-#endif
+Colour black = {0, 0, 0};
+
+Blinker::Blinker(int pin, rgb_led_color_order_t order)
+: _pin(pin)
+, _ledState(false)
+, _interval(100)
+, _lastInterval(0)
+, _order(order)
+, _colour(black) {
+  // empty
+}
+
+#else
 
 Blinker::Blinker(int pin, uint8_t valOff)
 : _pin(pin)
-, _valOff(valOff)
 , _ledState(false)
 , _interval(100)
 , _lastInterval(0)
-#ifdef RGB_BUILTIN
-, _colour(blue)
-#endif
-{
+, _valOff(valOff) {
   // empty
 }
 
+#endif
+
 #ifdef RGB_BUILTIN
 void Blinker::on(Colour colour, uint32_t interval) {
 #else
@@ -42,7 +52,7 @@ void Blinker::on(uint32_t interval) {
   _lastInterval = millis() - _interval;
   _ledState = true;
   #ifdef RGB_BUILTIN
-  rgbLedWrite(_pin, _colour.red, _colour.green, _colour.blue);
+  rgbLedWriteOrdered(_pin, _order, _colour.red, _colour.green, _colour.blue);
   #else
   digitalWrite(_pin, ~_valOff);
   #endif
@@ -65,7 +75,7 @@ void Blinker::loop() {
     if (_ledState) {
       rgbLedWrite(_pin, 0, 0, 0);
     } else {
-      rgbLedWrite(_pin, _colour.red, _colour.green, _colour.blue);
+      rgbLedWriteOrdered(_pin, _order, _colour.red, _colour.green, _colour.blue);
     }
     #else
     if (_ledState) {

src/Helpers/Blinker.h

@@ -26,27 +26,31 @@ extern Colour blue;
 extern Colour green;
 extern Colour red;
 extern Colour orange;
+extern Colour black;
 #endif
 
 class Blinker {
  public:
-  explicit Blinker(int pin, uint8_t valOff = LOW);
   #ifdef RGB_BUILTIN
+  explicit Blinker(int pin, rgb_led_color_order_t order = LED_COLOR_ORDER_GRB);
   void on(Colour colour, uint32_t interval = 0);
   #else
+  explicit Blinker(int pin, uint8_t valOff = LOW);
   void on(uint32_t interval = 0);
   #endif
   void off();
   void loop();
 
  protected:
   const int _pin;
-  const uint8_t _valOff;
   bool _ledState;
   uint32_t _interval;
   uint32_t _lastInterval;
   #ifdef RGB_BUILTIN
+  rgb_led_color_order_t _order;
   Colour _colour;
+  #else
+  const uint8_t _valOff;
   #endif
 };