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

Merge pull request #37 from 2blSoft/ver4dev

Browse Source 
Исправляем ошибку в определении вхождения в период в nowInTimePeriod
This commit is contained in:
Mit4el
2025-03-10 22:11:00 +03:00
committed by GitHub
parent 78742d90a1 a7a02db13d
commit 104bfbf092
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/modules/virtual/Math/Math.cpp
View File

@@ -37,9 +37,16 @@ private:
int h2 = selectToMarker(endTime, ":").toInt(); int h2 = selectToMarker(endTime, ":").toInt();
int min2 = selectToMarkerLast(endTime, ":").toInt(); int min2 = selectToMarkerLast(endTime, ":").toInt();
int sumMin1 = h1 * 60 + min1;
int sumMin2 = h2 * 60 + min2;
int nowMinutes = _time_local.hour * 60 + _time_local.minute; int nowMinutes = _time_local.hour * 60 + _time_local.minute;
return nowMinutes >= h1 * 60 + min1 && nowMinutes <= h2 * 60 + min2; if (sumMin1 <= sumMin2) {
return nowMinutes >= sumMin1 && nowMinutes <= sumMin2;
} else {
return nowMinutes >= sumMin1 && nowMinutes <= 24 * 60 || nowMinutes >= 0 && nowMinutes <= sumMin2;
}
} }