upd

Author: GyverLibs

docs/0.main.md

@@ -275,9 +275,9 @@ T* getData();
 Таймер, наследует `LoopTask` и `SimpleTimer`
 
 ```cpp
-LoopTimer(uint32_t ms, TaskCallback callback, bool states = false, bool events = false);
-LoopTimer(const char* id, uint32_t ms, TaskCallback callback, bool states = false, bool events = false);
-LoopTimer(hash_t id, uint32_t ms, TaskCallback callback, bool states = false, bool events = false);
+LoopTimer(uint32_t ms, TaskCallback callback, bool start = true, bool states = false, bool events = false);
+LoopTimer(const char* id, uint32_t ms, TaskCallback callback, bool start = true, bool states = false, bool events = false);
+LoopTimer(hash_t id, uint32_t ms, TaskCallback callback, bool start = true, bool states = false, bool events = false);
 
 // опрос таймера
 void poll();
@@ -287,9 +287,9 @@ void poll();
 Таймер для создания своих классов
 
 ```cpp
-LoopTimerBase(uint32_t ms);
-LoopTimerBase(const char* id, uint32_t ms);
-LoopTimerBase(hash_t id, uint32_t ms);
+LoopTimerBase(uint32_t ms, bool start = true);
+LoopTimerBase(const char* id, uint32_t ms, bool start = true);
+LoopTimerBase(hash_t id, uint32_t ms, bool start = true);
 
 // выполняется при срабатывании таймера
 virtual void exec() = 0;
@@ -299,9 +299,9 @@ virtual void exec() = 0;
 Таймер с данными
 
 ```cpp
-LoopTimerData(uint32_t ms, T* data, DataCallback callback);
-LoopTimerData(const char* id, uint32_t ms, T* data, DataCallback callback);
-LoopTimerData(hash_t id, uint32_t ms, T* data, DataCallback callback);
+LoopTimerData(uint32_t ms, T* data, DataCallback callback, bool start = true);
+LoopTimerData(const char* id, uint32_t ms, T* data, DataCallback callback, bool start = true);
+LoopTimerData(hash_t id, uint32_t ms, T* data, DataCallback callback, bool start = true);
 
 // подключить новые данные
 void setData(T* data);

library.properties

@@ -1,5 +1,5 @@
 name=Looper
-version=1.1.3
+version=1.1.4
 author=AlexGyver <[email protected]>
 maintainer=AlexGyver <[email protected]>
 sentence=Simple task, thread and event manager for Arduino

src/Looper.h

@@ -16,21 +16,21 @@
 // отложить отправку события
 #define LP_PUSH_EVENT(id, data) Looper.pushEvent(LPH(id), data)
 
-#define LP_MAKE(type, ...) static type _LP_CONCAT(__loop_obj_, __COUNTER__)(__VA_ARGS__)
-#define LP_MAKE_(id, type, ...) static type _LP_CONCAT(__loop_obj_, __COUNTER__)(LPH(id), __VA_ARGS__)
+#define LP_MAKE(type, ...) type _LP_CONCAT(__loop_obj_, __COUNTER__)(__VA_ARGS__)
+#define LP_MAKE_(id, type, ...) type _LP_CONCAT(__loop_obj_, __COUNTER__)(LPH(id), __VA_ARGS__)
 #define LP_NEW(type, ...) new type(__VA_ARGS__)
 #define LP_NEW_(id, type, ...) new type(LPH(id), __VA_ARGS__)
 
 // LISTENER
-#define LP_LISTENER_(id, func) LP_MAKE_(id, LoopListener, func)
+#define LP_LISTENER_(id, ...) LP_MAKE_(id, LoopListener, __VA_ARGS__)
 
 // TICKER
-#define LP_TICKER(func) LP_MAKE(LoopTicker, func)
-#define LP_TICKER_(id, func) LP_MAKE_(id, LoopTicker, func)
+#define LP_TICKER(...) LP_MAKE(LoopTicker, __VA_ARGS__)
+#define LP_TICKER_(id, ...) LP_MAKE_(id, LoopTicker, __VA_ARGS__)
 
 // TIMER
-#define LP_TIMER(ms, func) LP_MAKE(LoopTimer, ms, func)
-#define LP_TIMER_(id, ms, func) LP_MAKE_(id, LoopTimer, ms, func)
+#define LP_TIMER(ms, ...) LP_MAKE(LoopTimer, ms, __VA_ARGS__)
+#define LP_TIMER_(id, ms, ...) LP_MAKE_(id, LoopTimer, ms, __VA_ARGS__)
 
 // THREAD
 #define _LP_THREAD_CASE Looper.thisThread()->_case

src/nodes/Timer.h

@@ -1,14 +1,14 @@
 #pragma once
+#include "../utils/SimpleTimer.h"
 #include "CallbackData.h"
 #include "LoopTask.h"
-#include "../utils/SimpleTimer.h"
 
 // задача-интервальный таймер
 class LoopTimer : public LoopTask, public SimpleTimer {
    public:
-    LoopTimer(uint32_t ms, TaskCallback callback, bool states = false, bool events = false) : LoopTimer((hash_t)0, ms, callback, states, events) {}
-    LoopTimer(const char* id, uint32_t ms, TaskCallback callback, bool states = false, bool events = false) : LoopTimer(LPHr(id), ms, callback, states, events) {}
-    LoopTimer(hash_t id, uint32_t ms, TaskCallback callback, bool states = false, bool events = false) : LoopTask(id, callback, TASK_IS_TIMER, states, events), SimpleTimer(ms) {}
+    LoopTimer(uint32_t ms, TaskCallback callback, bool start = true, bool states = false, bool events = false) : LoopTimer((hash_t)0, ms, callback, start, states, events) {}
+    LoopTimer(const char* id, uint32_t ms, TaskCallback callback, bool start = true, bool states = false, bool events = false) : LoopTimer(LPHr(id), ms, callback, start, states, events) {}
+    LoopTimer(hash_t id, uint32_t ms, TaskCallback callback, bool start = true, bool states = false, bool events = false) : LoopTask(id, callback, TASK_IS_TIMER, states, events), SimpleTimer(ms, start) {}
 
     // опрос таймера
     void poll() {
@@ -19,9 +19,9 @@ class LoopTimer : public LoopTask, public SimpleTimer {
 // таймер для создания своих классов
 class LoopTimerBase : public LoopTimer {
    public:
-    LoopTimerBase(uint32_t ms) : LoopTimerBase((hash_t)0, ms) {}
-    LoopTimerBase(const char* id, uint32_t ms) : LoopTimerBase(LPHr(id), ms) {}
-    LoopTimerBase(hash_t id, uint32_t ms) : LoopTimer(id, ms, _exec) {}
+    LoopTimerBase(uint32_t ms, bool start = true) : LoopTimerBase((hash_t)0, ms, start) {}
+    LoopTimerBase(const char* id, uint32_t ms, bool start = true) : LoopTimerBase(LPHr(id), ms, start) {}
+    LoopTimerBase(hash_t id, uint32_t ms, bool start = true) : LoopTimer(id, ms, _exec, start) {}
 
     // выполняется при срабатывании таймера
     virtual void exec() = 0;
@@ -42,9 +42,9 @@ class LoopTimerData : public LoopTimer, public TaskCallbackData<T> {
     LP_MAKE_CALLBACK(DataCallback, void, T*);
 
    public:
-    LoopTimerData(uint32_t ms, T* data, DataCallback callback) : LoopTimerData((hash_t)0, ms, data, callback) {}
-    LoopTimerData(const char* id, uint32_t ms, T* data, DataCallback callback) : LoopTimerData(LPHr(id), ms, data, callback) {}
-    LoopTimerData(hash_t id, uint32_t ms, T* data, DataCallback callback) : LoopTimer(id, ms, _exec), TaskCallbackData<T>(data, callback) {}
+    LoopTimerData(uint32_t ms, T* data, DataCallback callback, bool start = true) : LoopTimerData((hash_t)0, ms, data, callback, start) {}
+    LoopTimerData(const char* id, uint32_t ms, T* data, DataCallback callback, bool start = true) : LoopTimerData(LPHr(id), ms, data, callback, start) {}
+    LoopTimerData(hash_t id, uint32_t ms, T* data, DataCallback callback, bool start = true) : LoopTimer(id, ms, _exec, start), TaskCallbackData<T>(data, callback) {}
 
    private:
     using LoopTask::attach;

src/utils/SimpleTimer.h

@@ -5,8 +5,8 @@
 // базовый миллисекундный таймер
 class SimpleTimer {
    public:
-    SimpleTimer(uint32_t ms = 0) {
-        if (ms) restart(ms);
+    SimpleTimer(uint32_t ms = 0, bool start = true) {
+        if (start && ms) restart(ms);
     }
 
     // перезапустить