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

Merge pull request #17 from Mit4el/ver4dev

Browse Source 
обновление с основы
This commit is contained in:
Mit4el
2023-10-03 22:56:25 +03:00
committed by GitHub
parent 264c1c3c71 eb171b2128
commit 660591dc60
37 changed files with 747 additions and 813 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/modules/virtual/LogingDaily/LogingDaily.cpp
View File

@@ -25,7 +25,7 @@ class LogingDaily : public IoTItem {
String prevDate = "";
bool firstTimeInit = true;
long interval;
// long interval;
public:
LogingDaily(String parameters) : IoTItem(parameters) {
@@ -40,8 +40,9 @@ class LogingDaily : public IoTItem {
points = 365;
SerialPrint("E", F("LogingDaily"), "'" + id + "' user set more points than allowed, value reset to 365");
}
jsonRead(parameters, F("int"), interval);
interval = interval * 1000 * 60; // приводим к милисекундам
long interval;
jsonRead(parameters, F("int"), interval); // в минутах
setInterval(interval * 60);
}
void doByInterval() {
@@ -225,16 +226,16 @@ class LogingDaily : public IoTItem {
return "";
}
void loop() {
if (enableDoByInt) {
currentMillis = millis();
difference = currentMillis - prevMillis;
if (difference >= interval) {
prevMillis = millis();
this->doByInterval();
}
}
}
// void loop() {
// if (enableDoByInt) {
// currentMillis = millis();
// difference = currentMillis - prevMillis;
// if (difference >= interval) {
// prevMillis = millis();
// this->doByInterval();
// }
// }
// }
// просто максимальное количество точек
int calculateMaxCount() {