From 934173f8cce1998622ef04cee2063b703aecb0b6 Mon Sep 17 00:00:00 2001
From: biver <batata@mail.ru>
Date: Mon, 25 Apr 2022 23:11:10 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D0=B7=D0=B2=D0=BE=D0=BB=D1=8F?=
 =?UTF-8?q?=D0=B5=D0=BC=20=D1=87=D0=B8=D1=82=D0=B0=D1=82=D1=8C=20=D0=BE?=
 =?UTF-8?q?=D0=B1=D1=8A=D0=B5=D0=BA=D1=82=20RTC=20=D0=BA=D0=B0=D0=BA=20?=
 =?UTF-8?q?=D0=BF=D0=B5=D1=80=D0=B5=D0=BC=D0=B5=D0=BD=D0=BD=D1=83=D1=8E=20?=
 =?UTF-8?q?=D1=81=20=D0=B4=D0=B0=D1=82=D0=BE=D0=B9=20=D0=B8=20=D0=B2=D1=80?=
 =?UTF-8?q?=D0=B5=D0=BC=D0=B5=D0=BD=D0=B5=D0=BC=20=D0=BF=D0=BE=20=D1=84?=
 =?UTF-8?q?=D0=BE=D1=80=D0=BC=D0=B0=D1=82=D1=83=20=D0=B8=D0=B7=20=D0=BD?=
 =?UTF-8?q?=D0=B0=D1=81=D1=82=D1=80=D0=BE=D0=B9=D0=BA=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data_svelte/items.json                         | 5 +++--
 src/modules/system/IarduinoRTC/IarduinoRTC.cpp | 8 +++++++-
 src/modules/system/IarduinoRTC/items.json      | 5 +++--
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/data_svelte/items.json b/data_svelte/items.json
index 9cbf71b7..69bdf142 100644
--- a/data_svelte/items.json
+++ b/data_svelte/items.json
@@ -15,11 +15,12 @@
         "widget": "",
         "page": "",
         "descr": "",
-        "int": "0",
+        "int": "1",
         "chipNum": 1,
         "rst": 16,
         "clk": 5,
-        "dat": 4
+        "dat": 4,
+        "defFormat": "d-m-Y"
     },
     {
         "name": "2. Расширитель портов Mcp23017",
diff --git a/src/modules/system/IarduinoRTC/IarduinoRTC.cpp b/src/modules/system/IarduinoRTC/IarduinoRTC.cpp
index a53906fd..47b78914 100644
--- a/src/modules/system/IarduinoRTC/IarduinoRTC.cpp
+++ b/src/modules/system/IarduinoRTC/IarduinoRTC.cpp
@@ -14,6 +14,7 @@ extern IoTRTC *watch;
 class IarduinoRTC : public IoTItem {
    private:
     int _chipNum, _rst, _clk, _dat;
+    String _defFormat;
     iarduino_RTC_BASE *RTCDriver;
 
    public:
@@ -23,6 +24,8 @@ class IarduinoRTC : public IoTItem {
         jsonRead(parameters, "rst", _rst);
         jsonRead(parameters, "clk", _clk);
         jsonRead(parameters, "dat", _dat);
+        jsonRead(parameters, "defFormat", _defFormat);
+        _defFormat = _defFormat + " ";  // костыль против обрезки последнего символа в библиотеке
 
         switch (_chipNum) {
             case 1:
@@ -41,7 +44,10 @@ class IarduinoRTC : public IoTItem {
         if (RTCDriver) RTCDriver->begin();
     }
     
-    void doByInterval() { }
+    void doByInterval() {
+        value.isDecimal = false;
+        value.valS = watch->gettime(_defFormat);
+    }
 
     IoTValue execute(String command, std::vector<IoTValue> &param) {
         if (command == "getTime") { 
diff --git a/src/modules/system/IarduinoRTC/items.json b/src/modules/system/IarduinoRTC/items.json
index 91de5286..43dc7367 100644
--- a/src/modules/system/IarduinoRTC/items.json
+++ b/src/modules/system/IarduinoRTC/items.json
@@ -9,10 +9,11 @@
         "page": "",
         "descr": "",
         
-        "int": "0",
+        "int": "1",
         "chipNum": 1,
         "rst": 16,
         "clk": 5,
-        "dat": 4
+        "dat": 4,
+        "defFormat": "d-m-Y"
     }
 ]
\ No newline at end of file