From 900ff95429019fe1146fda6bef29154b61a1409e Mon Sep 17 00:00:00 2001 From: biver Date: Tue, 26 Apr 2022 21:52:32 +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=D1=87=D0=B0=D1=81=D0=B0=D0=BC=20=D1=81=D0=BF?= =?UTF-8?q?=D0=BE=D1=81=D0=BE=D0=B1=D0=BD=D0=BE=D1=81=D1=82=D1=8C=20=D1=82?= =?UTF-8?q?=D0=B8=D0=BA=D0=B0=D1=82=D1=8C=20=D0=BA=D0=B0=D0=B6=D0=B4=D1=8B?= =?UTF-8?q?=D0=B5=20N=20=D1=81=D0=B5=D0=BA=D1=83=D0=BD=D0=B4=20=D0=B8=20?= =?UTF-8?q?=D1=81=D0=BE=D0=B7=D0=B4=D0=B0=D0=B2=D0=B0=D1=82=D1=8C=20=D1=81?= =?UTF-8?q?=D0=BE=D0=B1=D1=8B=D1=82=D0=B8=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data_svelte/items.json | 3 ++- src/modules/system/IarduinoRTC/IarduinoRTC.cpp | 4 +++- src/modules/system/IarduinoRTC/items.json | 3 ++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/data_svelte/items.json b/data_svelte/items.json index 506f7d58..aa73d603 100644 --- a/data_svelte/items.json +++ b/data_svelte/items.json @@ -20,7 +20,8 @@ "rst": 16, "clk": 5, "dat": 4, - "defFormat": "d-m-Y" + "defFormat": "d-m-Y", + "ticker": 0 }, { "name": "2. Расширитель портов Mcp23017", diff --git a/src/modules/system/IarduinoRTC/IarduinoRTC.cpp b/src/modules/system/IarduinoRTC/IarduinoRTC.cpp index 1c7eec69..6493c808 100644 --- a/src/modules/system/IarduinoRTC/IarduinoRTC.cpp +++ b/src/modules/system/IarduinoRTC/IarduinoRTC.cpp @@ -13,7 +13,7 @@ extern IoTRTC *watch; class IarduinoRTC : public IoTItem { private: - int _chipNum, _rst, _clk, _dat; + int _chipNum, _rst, _clk, _dat, _ticker; String _defFormat; iarduino_RTC_BASE *RTCDriver; @@ -25,6 +25,7 @@ class IarduinoRTC : public IoTItem { jsonRead(parameters, "clk", _clk); jsonRead(parameters, "dat", _dat); jsonRead(parameters, "defFormat", _defFormat); + jsonRead(parameters, "ticker", _ticker); _defFormat = _defFormat + " "; // костыль против обрезки последнего символа в библиотеке switch (_chipNum) { @@ -50,6 +51,7 @@ class IarduinoRTC : public IoTItem { void doByInterval() { value.isDecimal = false; value.valS = watch->gettime(_defFormat); + if (_ticker) regEvent(value.valS, "time ticker"); } IoTValue execute(String command, std::vector ¶m) { diff --git a/src/modules/system/IarduinoRTC/items.json b/src/modules/system/IarduinoRTC/items.json index 43dc7367..72a3bbf6 100644 --- a/src/modules/system/IarduinoRTC/items.json +++ b/src/modules/system/IarduinoRTC/items.json @@ -14,6 +14,7 @@ "rst": 16, "clk": 5, "dat": 4, - "defFormat": "d-m-Y" + "defFormat": "d-m-Y", + "ticker": 0 } ] \ No newline at end of file