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

Merge pull request #113 from biveraxe/ver3

Browse Source 
Дорабатываем механизм работы со временем в сценариях
This commit is contained in:
Dmitry Borisenko
2022-01-05 14:44:33 +01:00
committed by GitHub
parent c6d45f5d9a 3dcbd3dafb
commit b2b70a0d9d
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/Class/ScenarioClass3.h
View File

@@ -211,6 +211,10 @@ class Scenario {
setEventSign = selectFromMarkerToMarker(condition, " ", 1); setEventSign = selectFromMarkerToMarker(condition, " ", 1);
setEventValue = selectFromMarkerToMarker(condition, " ", 2); setEventValue = selectFromMarkerToMarker(condition, " ", 2);
String tmpStr;
tmpStr = getValue(setEventValue);
if (tmpStr != "no value") setEventValue = tmpStr;
if (!isDigitDotCommaStr(setEventValue)) { if (!isDigitDotCommaStr(setEventValue)) {
if (isTimeStr(incommingEventValue)) { if (isTimeStr(incommingEventValue)) {
int hhLStr = selectToMarker(incommingEventValue, ":").toInt(); int hhLStr = selectToMarker(incommingEventValue, ":").toInt();
@@ -220,8 +224,6 @@ class Scenario {
incommingEventValue = hhLStr*60 + mmLStr; incommingEventValue = hhLStr*60 + mmLStr;
setEventValue = hhRStr*60 + mmRStr; setEventValue = hhRStr*60 + mmRStr;
} else {
setEventValue = getValue(setEventValue);
} }
} }
} }