From 0f685a5f497afd4fbf649d147596b25b86a01f5a Mon Sep 17 00:00:00 2001
From: biver <batata@mail.ru>
Date: Wed, 27 Apr 2022 10:55:56 +0300
Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D1=8F=D0=B5=D0=BC=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D1=83=20?=
 =?UTF-8?q?=D0=B2=D1=8B=D0=B7=D0=BE=D0=B2=D0=B0=20gettime?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/system/IarduinoRTC/IarduinoRTC.cpp | 10 +++++-----
 src/modules/system/SysExt/SysExt.cpp           |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/modules/system/IarduinoRTC/IarduinoRTC.cpp b/src/modules/system/IarduinoRTC/IarduinoRTC.cpp
index 6493c808..5b8ada9f 100644
--- a/src/modules/system/IarduinoRTC/IarduinoRTC.cpp
+++ b/src/modules/system/IarduinoRTC/IarduinoRTC.cpp
@@ -26,7 +26,6 @@ class IarduinoRTC : public IoTItem {
         jsonRead(parameters, "dat", _dat);
         jsonRead(parameters, "defFormat", _defFormat);
         jsonRead(parameters, "ticker", _ticker);
-        _defFormat = _defFormat + " ";  // костыль против обрезки последнего символа в библиотеке
 
         switch (_chipNum) {
             case 0:
@@ -50,16 +49,17 @@ class IarduinoRTC : public IoTItem {
     
     void doByInterval() {
         value.isDecimal = false;
-        value.valS = watch->gettime(_defFormat);
+        value.valS = watch->gettime(_defFormat.c_str());   
         if (_ticker) regEvent(value.valS, "time ticker");
     }
 
     IoTValue execute(String command, std::vector<IoTValue> &param) {
+        IoTValue tmpValue;
         if (command == "getTime") { 
             if (param.size()) {
-                value.isDecimal = false;
-                value.valS = watch->gettime(param[0].valS);
-                return value;
+                tmpValue.isDecimal = false;
+                tmpValue.valS = watch->gettime(param[0].valS.c_str());   
+                return tmpValue;
             }
         } else if (command == "saveSysTime") {
             tm localTimeVar;	
diff --git a/src/modules/system/SysExt/SysExt.cpp b/src/modules/system/SysExt/SysExt.cpp
index cdac0c43..4f0541d3 100644
--- a/src/modules/system/SysExt/SysExt.cpp
+++ b/src/modules/system/SysExt/SysExt.cpp
@@ -54,7 +54,7 @@ class SysExt : public IoTItem {
         } else if (command == "getTime") { 
             if (param.size()) {
                 value.isDecimal = false;
-                value.valS = watch->gettime(param[0].valS);
+                value.valS = watch->gettime(param[0].valS.c_str());
                 return value;
             }
         }