iotmanager/IoTManager
1
0
Fork 0
mirror of https://github.com/IoTManagerProject/IoTManager.git synced 2026-03-30 03:49:13 +03:00
Code Issues Packages Projects Releases Wiki Activity

Исправляем ошибку вызова gettime

Browse Source
This commit is contained in:
biver
2022-04-27 10:55:56 +03:00
parent c658343e7f
commit 0f685a5f49
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/modules/system/IarduinoRTC/IarduinoRTC.cpp
View File

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

2
src/modules/system/SysExt/SysExt.cpp
View File

@@ -54,7 +54,7 @@ class SysExt : public IoTItem {
} else if (command == "getTime") { } else if (command == "getTime") {
if (param.size()) { if (param.size()) {
value.isDecimal = false; value.isDecimal = false;
value.valS = watch->gettime(param[0].valS); value.valS = watch->gettime(param[0].valS.c_str());
return value; return value;
} }
} }