Merge branch 'dev'

Author: tfeldmann

examples/CustomSpeed/CustomSpeed.ino

@@ -11,7 +11,8 @@ SpeedSetting mySettings = {
 void setup()
 {
     // blink 2x on repeat with custom settings
-    led.pattern(2, true, mySettings);
+    led.setSpeed(mySettings);
+    led.pattern(2, true);
 }
 
 void loop()

examples/SpeedAdjustment/SpeedAdjustment.ino

@@ -10,7 +10,8 @@ void setup()
     isFast = false;
     lastSwitch = millis();
 
-    led.blink(SPEED_SLOW);
+    led.setSpeed(SPEED_SLOW);
+    led.blink();
 }
 
 void loop()
@@ -22,6 +23,6 @@ void loop()
     {
         lastSwitch = millis();
         isFast = !isFast;
-        led.blink(isFast ? SPEED_FAST : SPEED_SLOW);
+        led.setSpeed(isFast ? SPEED_FAST : SPEED_SLOW);
     }
 }

src/BaseBlinker.cpp

@@ -59,10 +59,8 @@ void BaseBlinker::permanent(bool enable)
     update();
 }
 
-void BaseBlinker::blink(SpeedSetting speed)
+void BaseBlinker::blink()
 {
-    setSpeed(speed);
-
     // only switch mode if we are not blinking already
     if (mode_ != Mode::BLINKING)
     {
@@ -73,15 +71,13 @@ void BaseBlinker::blink(SpeedSetting speed)
     update();
 }
 
-void BaseBlinker::pattern(int num, bool repeat, SpeedSetting speed)
+void BaseBlinker::pattern(int num, bool repeat)
 {
-    setSpeed(speed);
-    pattern(num, 0, repeat, speed);
+    pattern(num, 0, repeat);
 }
 
-void BaseBlinker::pattern(int num1, int num2, bool repeat, SpeedSetting speed)
+void BaseBlinker::pattern(int num1, int num2, bool repeat)
 {
-    setSpeed(speed);
     repeat_ = repeat;
 
     if (mode_ != Mode::PATTERN || num1_ != num1 || num2_ != num2)

src/BaseBlinker.h

@@ -35,15 +35,7 @@ class BaseBlinker
 public:
     BaseBlinker();
 
-    void setSpeed(uint16_t on_ms);
-    void setSpeed(
-        uint16_t on_ms,
-        uint16_t off_ms,
-        uint16_t pause_ms,
-        uint16_t ending_ms);
-    void setSpeed(SpeedSetting setting);
-
-    // `true` if the Blinkenlight is currently blinking, showing a pattern, flashing or pausing
+    // `true` if it is currently blinking, showing a pattern, flashing or pausing
     bool isOn();
 
     // set permanently ON
@@ -59,24 +51,31 @@ class BaseBlinker
     void permanent(bool enable);
 
     // blink infinitely
-    void blink(SpeedSetting speed = SPEED_FAST);
+    void blink();
 
     // blink `num` times, then long pause
     // repeats if `repeat` is set, otherwise it is OFF afterwards
-    void pattern(int num,
-                 bool repeat = true, SpeedSetting speed = SPEED_FAST);
+    void pattern(int num, bool repeat = true);
 
     // blink `num1` times, short pause, blink `num2` times, long pause
     // repeats if `repeat` is set, otherwise it is OFF afterwards
-    void pattern(int num1, int num2,
-                 bool repeat = true, SpeedSetting speed = SPEED_FAST);
+    void pattern(int num1, int num2, bool repeat = true);
 
     // turn ON for the given duration in ms. Continues in the previous mode afterwards.
     void flash(uint16_t duration_ms);
 
     // turn OFF for the given duration in ms. Continues in the previous mode afterwards.
     void pause(uint16_t duration_ms);
 
+    // different methods to set the speed settings
+    void setSpeed(uint16_t on_ms);
+    void setSpeed(
+        uint16_t on_ms,
+        uint16_t off_ms,
+        uint16_t pause_ms,
+        uint16_t ending_ms);
+    void setSpeed(SpeedSetting setting);
+
     // You must call this in your loop!
     // Returns the current value of the indiciator (LOW / HIGH)
     virtual int update();