From 41311e4e0c5d4e666733fa2586f665ca493640fe Mon Sep 17 00:00:00 2001 From: biver Date: Tue, 22 Nov 2022 22:31:21 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A3=D1=81=D1=82=D1=80=D0=B0=D0=BD=D1=8F?= =?UTF-8?q?=D0=B5=D0=BC=20=D0=BB=D0=BE=D0=B6=D0=BD=D0=BE=D0=B5=20=D1=81?= =?UTF-8?q?=D1=80=D0=B0=D0=B1=D0=B0=D1=82=D1=8B=D0=B2=D0=B0=D0=BD=D0=B8?= =?UTF-8?q?=D0=B5=20=D0=BA=D1=80=D0=BE=D0=BD=D0=B0=20=D0=BF=D1=80=D0=B8=20?= =?UTF-8?q?=D0=B7=D0=B0=D0=BF=D1=83=D1=81=D0=BA=D0=B5=20=D0=9C=D0=9A=20?= =?UTF-8?q?=D0=BF=D0=BE=20=D0=BF=D1=80=D0=B8=D1=87=D0=B8=D0=BD=D0=B5=20?= =?UTF-8?q?=D0=BF=D1=80=D0=B5=D0=B6=D0=B4=D0=B5=D0=B2=D1=80=D0=B5=D0=BC?= =?UTF-8?q?=D0=B5=D0=BD=D0=BD=D0=BE=D0=B9=20=D0=B8=D0=BD=D0=B8=D1=86=D0=B8?= =?UTF-8?q?=D0=B0=D0=BB=D0=B8=D0=B7=D0=B0=D1=86=D0=B8=D0=B8=20=D0=BF=D0=B5?= =?UTF-8?q?=D1=80=D0=B5=D0=BC=D0=B5=D0=BD=D0=BD=D1=8B=D1=85=20=D0=B4=D0=BE?= =?UTF-8?q?=20=D0=BF=D0=BE=D0=BB=D1=83=D1=87=D0=B5=D0=BD=D0=B8=D1=8F=20?= =?UTF-8?q?=D0=B4=D0=BE=D0=B2=D0=B5=D1=80=D0=B5=D0=BD=D0=BD=D0=BE=D0=B3?= =?UTF-8?q?=D0=BE=20=D0=B2=D1=80=D0=B5=D0=BC=D0=B5=D0=BD=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/virtual/Cron/Cron.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/modules/virtual/Cron/Cron.cpp b/src/modules/virtual/Cron/Cron.cpp index 2c24eb59..55eb933a 100644 --- a/src/modules/virtual/Cron/Cron.cpp +++ b/src/modules/virtual/Cron/Cron.cpp @@ -13,11 +13,12 @@ class Cron : public IoTItem { String _format = ""; cron_expr _expr; time_t _nextAlarm = 0; + bool _isInit = false; public: Cron(String parameters): IoTItem(parameters) { jsonRead(parameters, F("formatNextAlarm"), _format); - initCron(); + if (_time_isTrust) initCron(); } void initCron() { @@ -39,6 +40,7 @@ class Cron : public IoTItem { if (forced || (_nextAlarm <= gmtTimeToLocal(unixTime))) { // update alarm if next trigger is not yet in the future _nextAlarm = cron_next(&_expr, gmtTimeToLocal(unixTime)); + _isInit = true; } } } @@ -58,6 +60,8 @@ class Cron : public IoTItem { } void setValue(const IoTValue& Value, bool genEvent) { + if (!_time_isTrust) return; + value = Value; _pause = false; initCron(); @@ -74,6 +78,7 @@ class Cron : public IoTItem { } void doByInterval() { + if (!_isInit && _time_isTrust) initCron(); if (!_pause && _time_isTrust && (gmtTimeToLocal(unixTime) >= _nextAlarm)) { updateNextAlarm(true); bool _needSaveBak = _needSave;