Avoid unnecessary parameter passing - refactoring, same generated footprint.

Author: dok-net

libraries/Ticker/examples/TickerParameter/TickerParameter.ino

@@ -13,8 +13,17 @@
 
 #include <Ticker.h>
 
-Ticker tickerSetHigh;
 Ticker tickerSetLow;
+Ticker tickerSetHigh;
+Ticker tickerSetChar;
+
+void setPinLow() {
+	digitalWrite(LED_BUILTIN, 0);
+}
+
+void setPinHigh() {
+	digitalWrite(LED_BUILTIN, 1);
+}
 
 void setPin(int state) {
   digitalWrite(LED_BUILTIN, state);
@@ -27,12 +36,14 @@ void setPinChar(char state) {
 void setup() {
   pinMode(LED_BUILTIN, OUTPUT);
 
-  // every 25 ms, call setPin(0)
-  tickerSetLow.attach_ms(25, setPin, 0);
+  // every 25 ms, call setPinLow()
+  tickerSetLow.attach_ms(25, setPinLow);
 
-  // every 26 ms, call setPinChar(1)
-  tickerSetHigh.attach_ms(26, setPinChar, (char)1);
+  // every 26 ms, call setPinHigh()
+  tickerSetHigh.attach_ms(26, setPinHigh);
 
+  // every 54 ms, call setPinChar(1)
+  tickerSetChar.attach_ms(26, setPinChar, (char)1);
 }
 
 void loop() {

libraries/Ticker/src/Ticker.h

@@ -38,25 +38,25 @@ class Ticker
     void attach_scheduled(float seconds, callback_function_t callback)
     {
         _callback_function = [callback]() { schedule_function(callback); };
-        _attach_ms(1000UL * seconds, true, _static_callback, this);
+        _attach_ms(1000UL * seconds, true);
     }
 
     void attach(float seconds, callback_function_t callback)
     {
         _callback_function = std::move(callback);
-        _attach_ms(1000UL * seconds, true, _static_callback, this);
+        _attach_ms(1000UL * seconds, true);
     }
 
     void attach_ms_scheduled(uint32_t milliseconds, callback_function_t callback)
     {
         _callback_function = [callback]() { schedule_function(callback); };
-        _attach_ms(milliseconds, true, _static_callback, this);
+        _attach_ms(milliseconds, true);
     }
 
     void attach_ms(uint32_t milliseconds, callback_function_t callback)
     {
         _callback_function = std::move(callback);
-        _attach_ms(milliseconds, true, _static_callback, this);
+        _attach_ms(milliseconds, true);
     }
 
     template<typename TArg>
@@ -76,25 +76,25 @@ class Ticker
     void once_scheduled(float seconds, callback_function_t callback)
     {
         _callback_function = [callback]() { schedule_function(callback); };
-        _attach_ms(1000UL * seconds, false, _static_callback, this);
+        _attach_ms(1000UL * seconds, false);
     }
 
     void once(float seconds, callback_function_t callback)
     {
         _callback_function = std::move(callback);
-        _attach_ms(1000UL * seconds, false, _static_callback, this);
+        _attach_ms(1000UL * seconds, false);
     }
 
     void once_ms_scheduled(uint32_t milliseconds, callback_function_t callback)
     {
         _callback_function = [callback]() { schedule_function(callback); };
-        _attach_ms(milliseconds, false, _static_callback, this);
+        _attach_ms(milliseconds, false);
     }
 
     void once_ms(uint32_t milliseconds, callback_function_t callback)
     {
         _callback_function = std::move(callback);
-        _attach_ms(milliseconds, false, _static_callback, this);
+        _attach_ms(milliseconds, false);
     }
 
     template<typename TArg>
@@ -117,6 +117,10 @@ class Ticker
 protected:
     static void _static_callback(void* arg);
     void _attach_ms(uint32_t milliseconds, bool repeat, callback_with_arg_t callback, void* arg);
+    void _attach_ms(uint32_t milliseconds, bool repeat)
+    {
+        _attach_ms(milliseconds, repeat, _static_callback, this);
+    }
 
     ETSTimer* _timer;
     callback_function_t _callback_function = nullptr;