From 0451aca0d58fc4c8ef7e935a61c433d3b27c57ee Mon Sep 17 00:00:00 2001 From: biver Date: Sun, 27 Mar 2022 10:47:21 +0300 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D1=8F?= =?UTF-8?q?=D0=B5=D0=BC=20=D0=BD=D0=B0=D1=81=D1=80=D0=BE=D0=BA=D1=83=20?= =?UTF-8?q?=D0=B4=D0=BB=D1=8F=20=D1=82=D0=B0=D0=B9=D0=BC=D0=B5=D1=80=D0=B0?= =?UTF-8?q?=20=D0=B4=D0=BB=D1=8F=20=D0=B2=D0=BA=D0=BB=D1=8E=D1=87=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D1=8F=20=D1=80=D0=B5=D0=B6=D0=B8=D0=BC=D0=B0=20?= =?UTF-8?q?=D1=81=D0=BE=D1=85=D1=80=D0=B0=D0=BD=D0=B5=D0=BD=D0=B8=D1=8F=20?= =?UTF-8?q?=D0=B7=D0=BD=D0=B0=D1=87=D0=B5=D0=BD=D0=B8=D1=8F=20=D1=81=D1=87?= =?UTF-8?q?=D0=B5=D1=82=D1=87=D0=B8=D0=BA=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/exec/Timer/Timer.cpp | 4 +++- src/modules/exec/Timer/items.json | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/modules/exec/Timer/Timer.cpp b/src/modules/exec/Timer/Timer.cpp index 63fa66fd..269c8023 100644 --- a/src/modules/exec/Timer/Timer.cpp +++ b/src/modules/exec/Timer/Timer.cpp @@ -9,6 +9,7 @@ class Timer : public IoTItem { bool _unfin = false; bool _ticker = false; bool _repeat = false; + bool _needSave = false; public: Timer(String parameters): IoTItem(parameters) { @@ -19,12 +20,13 @@ class Timer : public IoTItem { jsonRead(parameters, "repeat", _repeat); if (_repeat) _repeat = valDtmp; // если в параметрах просят повторить, то запоминаем настроечное значение отчета _unfin = !value.valD; + jsonRead(parameters, "needSave", _needSave); // нужно сохранять счетчик в постоянную память } void doByInterval() { if (!_unfin && value.valD) { value.valD--; - needSave = true; + if (_needSave) needSave = true; if (value.valD == 0) { regEvent(value.valD, "Time's up"); if (_repeat) value.valD = _repeat; diff --git a/src/modules/exec/Timer/items.json b/src/modules/exec/Timer/items.json index 821676a5..22445f36 100644 --- a/src/modules/exec/Timer/items.json +++ b/src/modules/exec/Timer/items.json @@ -12,6 +12,7 @@ "int": 1, "countDown": 15, "ticker": 0, - "repeat": 0 + "repeat": 0, + "needSave": 0 } ] \ No newline at end of file