iotmanager/IoTManager
1
0
Fork 0
mirror of https://github.com/IoTManagerProject/IoTManager.git synced 2026-03-31 04:19:15 +03:00
Code Issues Packages Projects Releases Wiki Activity

Добавляем параметр повторения для таймера

Browse Source
This commit is contained in:
biver
2022-03-26 21:35:51 +03:00
parent cf6fd585c3
commit 613d60256a
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/modules/exec/Timer/Timer.cpp
View File

@@ -8,18 +8,26 @@ class Timer : public IoTItem {
private: private:
bool _unfin = false; bool _unfin = false;
bool _ticker = false; bool _ticker = false;
bool _repeat = false;
public: public:
Timer(String parameters): IoTItem(parameters) { Timer(String parameters): IoTItem(parameters) {
jsonRead(parameters, "countDown", value.valD); jsonRead(parameters, "countDown", value.valD);
jsonRead(parameters, "ticker", _ticker); jsonRead(parameters, "ticker", _ticker);
jsonRead(parameters, "repeat", _repeat);
if (_repeat) _repeat = value.valD; // если в параметрах просят повторить, то запоминаем настроечное значение отчета
_unfin = !value.valD; _unfin = !value.valD;
} }
void doByInterval() { void doByInterval() {
if (!_unfin && value.valD) { if (!_unfin && value.valD) {
value.valD--; value.valD--;
if (value.valD == 0) regEvent(value.valD, "Time's up"); if (value.valD == 0) {
regEvent(value.valD, "Time's up");
if (_repeat) value.valD = _repeat;
}
} }
if (_ticker) regEvent(value.valD, "Timer tick"); if (_ticker) regEvent(value.valD, "Timer tick");

3
src/modules/exec/Timer/items.json
View File

@@ -11,6 +11,7 @@
"int": 1, "int": 1,
"countDown": 15, "countDown": 15,
"ticker": 0 "ticker": 0,
"repeat": 0
} }
] ]